diff options
| author | axis <qt-info@nokia.com> | 2011-03-09 11:47:19 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-09 11:47:19 +0100 |
| commit | b55419367a71aadd03be9adfa65af8840380858d (patch) | |
| tree | 502bd675f5ce04af912b45433e58cd88d03310ec | |
| parent | c96c0afc6dcbe430d97438358b8fdb15fda52e58 (diff) | |
Removed all the 4.7 patches and made master patches the default.
70 files changed, 264 insertions, 6677 deletions
diff --git a/patches/0001-Some-changes-for-qtkernel.patch b/patches/0001-Some-changes-for-qtkernel.patch index 6c55633..26fff8c 100644 --- a/patches/0001-Some-changes-for-qtkernel.patch +++ b/patches/0001-Some-changes-for-qtkernel.patch @@ -1,4 +1,4 @@ -From ad8a75581e88539b551fa073bd7d3f8224ff155d Mon Sep 17 00:00:00 2001 +From 8aa39581665941c5ab7af138dc1e0e42ab63e97e Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 8 Nov 2010 20:09:10 -0600 Subject: [PATCH] Some changes for qtkernel @@ -9,13 +9,13 @@ Subject: [PATCH] Some changes for qtkernel qtkernel/qtkernel.pro | 32 +---------- qtkernel/src/plugins/accessible/accessible.pro | 1 - qtkernel/src/plugins/plugins.pro | 5 +- - qtkernel/src/src.pro | 74 +----------------------- + qtkernel/src/src.pro | 75 +----------------------- qtkernel/src/tools/tools.pro | 5 +- qtkernel/tools/configure/configureapp.cpp | 2 +- - 8 files changed, 11 insertions(+), 131 deletions(-) + 8 files changed, 11 insertions(+), 132 deletions(-) diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index b8f1ee7..8e2cfb2 100755 +index 32b5384..9d5eece 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt @@ -34,28 +34,13 @@ my %modules = ( # path to module name map @@ -47,20 +47,20 @@ index b8f1ee7..8e2cfb2 100755 ); #$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; -@@ -693,7 +678,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); +@@ -692,7 +677,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); my @ignore_for_include_check = ( "qatomic.h" ); my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); - my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); + my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); -my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" ); +my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDBus}" ); my %colliding_headers = (); my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir diff --git a/qtkernel/configure b/qtkernel/configure -index 5e8ef17..b9c3ac5 100755 +index cddea86..c608b3c 100755 --- a/qtkernel/configure +++ b/qtkernel/configure -@@ -8412,11 +8412,11 @@ EXEC="" +@@ -8718,11 +8718,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then @@ -133,7 +133,7 @@ index a7caf07..26c7d30 100644 - contains(QT_CONFIG, qt3support):SUBDIRS += compat } diff --git a/qtkernel/src/plugins/plugins.pro b/qtkernel/src/plugins/plugins.pro -index afa0901..fce7e3a 100644 +index 3e7da0e..d0d7188 100644 --- a/qtkernel/src/plugins/plugins.pro +++ b/qtkernel/src/plugins/plugins.pro @@ -1,6 +1,6 @@ @@ -142,25 +142,27 @@ index afa0901..fce7e3a 100644 -SUBDIRS *= sqldrivers script bearer +SUBDIRS *= sqldrivers bearer unix:!symbian { - contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv):SUBDIRS *= codecs + contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs } else { -@@ -12,6 +12,3 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers +@@ -12,7 +12,4 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 -contains(QT_CONFIG, phonon): SUBDIRS *= phonon -contains(QT_CONFIG, multimedia): SUBDIRS *= audio + qpa:SUBDIRS += platforms -contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro -index 060f48b..b64bf9c 100644 +index 0908911..6da0877 100644 --- a/qtkernel/src/src.pro +++ b/qtkernel/src/src.pro -@@ -4,32 +4,18 @@ TEMPLATE = subdirs +@@ -4,33 +4,19 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain symbian:SRC_SUBDIRS += src_s60main -SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib +SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml + nacl: SRC_SUBDIRS -= src_network src_testlib !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui -!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support @@ -190,7 +192,7 @@ index 060f48b..b64bf9c 100644 # and s60installs depends on all the others. symbian:SRC_SUBDIRS += src_s60installs -@@ -43,8 +29,6 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib +@@ -44,8 +30,6 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib src_corelib.target = sub-corelib src_xml.subdir = $$QT_SOURCE_TREE/src/xml src_xml.target = sub-xml @@ -199,7 +201,7 @@ index 060f48b..b64bf9c 100644 src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus src_dbus.target = sub-dbus src_gui.subdir = $$QT_SOURCE_TREE/src/gui -@@ -55,36 +39,14 @@ src_network.subdir = $$QT_SOURCE_TREE/src/network +@@ -56,36 +40,14 @@ src_network.subdir = $$QT_SOURCE_TREE/src/network src_network.target = sub-network src_svg.subdir = $$QT_SOURCE_TREE/src/svg src_svg.target = sub-svg @@ -236,7 +238,7 @@ index 060f48b..b64bf9c 100644 #CONFIG += ordered !wince*:!ordered:!symbian-abld:!symbian-sbsv2 { -@@ -92,56 +54,26 @@ src_webkit_declarative.target = sub-webkitdeclarative +@@ -93,57 +55,26 @@ src_webkit_declarative.target = sub-webkitdeclarative src_gui.depends = src_corelib src_tools_uic embedded: src_gui.depends += src_network src_xml.depends = src_corelib @@ -256,10 +258,11 @@ index 060f48b..b64bf9c 100644 - src_phonon.depends = src_gui - src_multimedia.depends = src_gui - contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl -- src_tools_activeqt.depends = src_tools_idc src_gui +- src_activeqt.depends = src_tools_idc src_gui - src_declarative.depends = src_gui src_script src_network - src_plugins.depends = src_gui src_sql src_svg - contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia +- contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative + src_plugins.depends = src_gui src_sql src_svg src_xml src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs @@ -325,10 +328,10 @@ index 4736d09..ca42da6 100644 debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index 1b77058..648eb65 100644 +index 19cef9a..6cba094 100644 --- a/qtkernel/tools/configure/configureapp.cpp +++ b/qtkernel/tools/configure/configureapp.cpp -@@ -3807,7 +3807,7 @@ void Configure::generateMakefiles() +@@ -3828,7 +3828,7 @@ void Configure::generateMakefiles() } // don't pass -spec - .qmake.cache has it already args << "-r"; @@ -338,5 +341,5 @@ index 1b77058..648eb65 100644 args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/0002-qmake-profiles-for-qttools.patch b/patches/0002-qmake-profiles-for-qttools.patch index a9ed023..a27f34b 100644 --- a/patches/0002-qmake-profiles-for-qttools.patch +++ b/patches/0002-qmake-profiles-for-qttools.patch @@ -1,4 +1,4 @@ -From 72ad311afedec5904d3b877a14ee44b1443a5961 Mon Sep 17 00:00:00 2001 +From e1f49d0a65ee60ec9360e5165c79c1ccf1c70e62 Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Fri, 12 Nov 2010 12:48:25 +0100 Subject: [PATCH] qmake profiles for qttools @@ -26,11 +26,11 @@ diff --git a/qttools/src/tools.pro b/qttools/src/src.pro similarity index 89% rename from qttools/src/tools.pro rename to qttools/src/src.pro -index 8f23fe4..03a8f7c 100644 +index e82bcaa..7b0b114 100644 --- a/qttools/src/tools.pro +++ b/qttools/src/src.pro @@ -23,7 +23,6 @@ TEMPLATE = subdirs - unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig + unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } - contains(QT_CONFIG, declarative):SUBDIRS += qml diff --git a/patches/0003-Expose-source-and-build-directories-for-QtKernel.patch b/patches/0003-Expose-source-and-build-directories-for-QtKernel.patch index a9a838f..bb47a51 100644 --- a/patches/0003-Expose-source-and-build-directories-for-QtKernel.patch +++ b/patches/0003-Expose-source-and-build-directories-for-QtKernel.patch @@ -1,4 +1,4 @@ -From 9ae47cb57d7222a44dc58f6d4edc5f69a5839f3c Mon Sep 17 00:00:00 2001 +From 069a613402f6381a26d65aac9d45a5cdcbd2fc02 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 11 Nov 2010 09:35:09 -0600 Subject: [PATCH] Expose source and build directories for QtKernel @@ -12,10 +12,10 @@ Also expose moc, uic, rcc, qdbusxml2cpp, include and lib create mode 100644 qtkernel/mkspecs/features/qt_module.prf diff --git a/qtkernel/configure b/qtkernel/configure -index b9c3ac5..73e72d9 100755 +index c608b3c..51f3f03 100755 --- a/qtkernel/configure +++ b/qtkernel/configure -@@ -7906,10 +7906,10 @@ else +@@ -8213,10 +8213,10 @@ else fi done fi @@ -27,7 +27,7 @@ index b9c3ac5..73e72d9 100755 QTCONFIG="$outpath/mkspecs/qconfig.pri" QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -@@ -7994,23 +7994,19 @@ else +@@ -8301,23 +8301,19 @@ else fi #------------------------------------------------------------------------------- @@ -55,14 +55,13 @@ index b9c3ac5..73e72d9 100755 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include -@@ -8020,66 +8016,87 @@ EOF +@@ -8327,65 +8323,86 @@ EOF # Ensure we can link to uninistalled libraries - if [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then + if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then - echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$CACHEFILE.tmp" + echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp" fi - if [ -n "$QT_CFLAGS_PSQL" ]; then - echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp" + echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp" @@ -183,10 +182,10 @@ index 0000000..3ec941a + debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") +} diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index 648eb65..57c5928 100644 +index 6cba094..bd2225f 100644 --- a/qtkernel/tools/configure/configureapp.cpp +++ b/qtkernel/tools/configure/configureapp.cpp -@@ -2864,63 +2864,101 @@ void Configure::generateCachefile() +@@ -2888,63 +2888,101 @@ void Configure::generateCachefile() QFile cacheFile(buildPath + "/.qmake.cache"); if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. QTextStream cacheStream(&cacheFile); @@ -312,7 +311,7 @@ index 648eb65..57c5928 100644 configStream << "CONFIG+= "; configStream << dictionary[ "BUILD" ]; if (dictionary[ "SHARED" ] == "yes") -@@ -2976,26 +3014,6 @@ void Configure::generateCachefile() +@@ -3000,26 +3038,6 @@ void Configure::generateCachefile() << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; @@ -340,5 +339,5 @@ index 648eb65..57c5928 100644 configFile.close(); } -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/0004-Start-work-on-XmlPatterns.patch b/patches/0004-Start-work-on-XmlPatterns.patch index 8dd5e0c..e1b84ed 100644 --- a/patches/0004-Start-work-on-XmlPatterns.patch +++ b/patches/0004-Start-work-on-XmlPatterns.patch @@ -1,4 +1,4 @@ -From c4c8c636ecb40ec0ae1d42950da50556334327db Mon Sep 17 00:00:00 2001 +From 37e1e9428522a66f718adb7b07f7e88e12c56b56 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Fri, 12 Nov 2010 13:31:46 -0600 Subject: [PATCH] Start work on XmlPatterns @@ -8,7 +8,7 @@ Subject: [PATCH] Start work on XmlPatterns 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -index e50d184..749c383 100644 +index d22f417..d7db65c 100644 --- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro +++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro @@ -1,3 +1,5 @@ @@ -19,7 +19,7 @@ index e50d184..749c383 100644 QT = core \ @@ -7,8 +9,8 @@ DEFINES += QT_BUILD_XMLPATTERNS_LIB \ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 - unix:QMAKE_PKGCONFIG_REQUIRES = QtCore \ + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ QtNetwork -include(../qbase.pri) -PRECOMPILED_HEADER = ../corelib/global/qt_pch.h diff --git a/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch b/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch index e240171..a4a5d31 100644 --- a/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch +++ b/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch @@ -1,4 +1,4 @@ -From a45f548ce321e98d0f6d86392417d789f9cdf525 Mon Sep 17 00:00:00 2001 +From 64a4f149f254efd723afcc160e378b04d3110980 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Mon, 15 Nov 2010 16:43:22 +0100 Subject: [PATCH] Expose private support for separate module in syncqt. @@ -8,10 +8,10 @@ Subject: [PATCH] Expose private support for separate module in syncqt. 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 6a7db91..4122342 100755 +index 9d5eece..b8162d2 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt -@@ -81,6 +81,7 @@ sub showUsage +@@ -82,6 +82,7 @@ sub showUsage print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; print " -quiet Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n"; print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; @@ -19,7 +19,7 @@ index 6a7db91..4122342 100755 print " -help This help\n"; exit 0; } -@@ -588,6 +589,9 @@ while ( @ARGV ) { +@@ -587,6 +588,9 @@ while ( @ARGV ) { } elsif($arg eq "-quiet") { $var = "quiet"; $val = "yes"; @@ -29,7 +29,7 @@ index 6a7db91..4122342 100755 } elsif($arg eq "-base-dir") { # skip, it's been dealt with at the top of the file shift @ARGV; -@@ -650,7 +654,6 @@ while ( @ARGV ) { +@@ -649,7 +653,6 @@ while ( @ARGV ) { push @modules_to_sync, $module; $moduleheaders{$module} = $headerdir; $create_uic_class_map = 0; diff --git a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch index 030949b..d0088d4 100644 --- a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch +++ b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch @@ -1,4 +1,4 @@ -From be75ebc4c6681b4ce6c81a8a8991b56b427940fc Mon Sep 17 00:00:00 2001 +From 84111def10db648cc8a1dcb797dea17857139708 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 15 Nov 2010 13:55:17 -0600 Subject: [PATCH] Make syncqt use sync.profile files from each module @@ -6,18 +6,18 @@ Subject: [PATCH] Make syncqt use sync.profile files from each module The sync.profile replaces the hardcoded paths inside syncqt, and enables it to work for other modules than just qtkernel. --- - qtkernel/bin/syncqt | 162 +++++++++++++++-------------- + qtkernel/bin/syncqt | 163 +++++++++++++++-------------- qtkernel/configure | 3 +- qtkernel/sync.profile | 44 ++++++++ qtkernel/tools/configure/configureapp.cpp | 4 +- - 4 files changed, 129 insertions(+), 84 deletions(-) + 4 files changed, 130 insertions(+), 84 deletions(-) create mode 100644 qtkernel/sync.profile diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index f5b4f12..a58b879 100755 +index b8162d2..7e5fc44 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt -@@ -12,40 +12,20 @@ +@@ -12,40 +12,22 @@ use File::Basename; use File::Path; use Cwd; @@ -31,12 +31,13 @@ index f5b4f12..a58b879 100755 - last; - } -} -- --die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check +# set output basedir to be where ever syncqt is run from +our $out_basedir = getcwd(); +$out_basedir =~ s=\\=/=g; +our $basedir; ++our $quoted_basedir; + +-die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check -# global variables -my $isunix = 0; @@ -66,17 +67,18 @@ index f5b4f12..a58b879 100755 my $module = 0; my $showonly = 0; my $quiet = 0; -@@ -58,8 +38,7 @@ my $create_uic_class_map = 1; +@@ -58,9 +40,7 @@ my $create_uic_class_map = 1; my $create_private_headers = 1; my @modules_to_sync ; $force_relative = 1 if ( -d "/System/Library/Frameworks" ); -my $out_basedir = $basedir; -$out_basedir =~ s=\\=/=g; +-my $quoted_basedir = "\Q$basedir"; + # functions ---------------------------------------------------------- -@@ -73,6 +52,8 @@ $out_basedir =~ s=\\=/=g; +@@ -74,6 +54,8 @@ my $quoted_basedir = "\Q$basedir"; sub showUsage { print "$0 usage:\n"; @@ -85,7 +87,7 @@ index f5b4f12..a58b879 100755 print " -copy Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n"; print " -remove-stale Removes stale headers (default: " . ($remove_stale ? "yes" : "no") . ")\n"; print " -relative Force relative symlinks (default: " . ($force_relative ? "yes" : "no") . ")\n"; -@@ -154,37 +135,9 @@ sub shouldMasterInclude { +@@ -155,37 +137,9 @@ sub shouldMasterInclude { sub classNames { my @ret; my ($iheader) = @_; @@ -126,7 +128,7 @@ index f5b4f12..a58b879 100755 my $parsable = ""; if(open(F, "<$iheader")) { -@@ -547,6 +500,52 @@ sub findFiles { +@@ -546,6 +500,52 @@ sub findFiles { return @files; } @@ -174,12 +176,12 @@ index f5b4f12..a58b879 100755 +# check if this is an in-source build, and if so use that as the basedir too +$basedir = locateSyncProfile($out_basedir); +$basedir = dirname($basedir) if ($basedir); -+ ++$quoted_basedir = "\Q$basedir"; + # -------------------------------------------------------------------- # "main" function # -------------------------------------------------------------------- -@@ -596,6 +595,15 @@ while ( @ARGV ) { +@@ -595,6 +595,15 @@ while ( @ARGV ) { # skip, it's been dealt with at the top of the file shift @ARGV; next; @@ -195,7 +197,7 @@ index f5b4f12..a58b879 100755 } #do something -@@ -667,6 +675,13 @@ while ( @ARGV ) { +@@ -666,6 +675,13 @@ while ( @ARGV ) { $out_basedir =~ s=\\=/=g; } } @@ -209,14 +211,14 @@ index f5b4f12..a58b879 100755 @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); $isunix = checkUnix; #cache checkUnix -@@ -677,11 +692,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; +@@ -676,11 +692,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; my @ignore_headers = (); my $class_lib_map_contents = ""; -my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); -my @ignore_for_include_check = ( "qatomic.h" ); -my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); --my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); +-my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); -my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDBus}" ); +our @ignore_for_master_contents = (); +our @ignore_for_include_check = (); @@ -226,7 +228,7 @@ index f5b4f12..a58b879 100755 my %colliding_headers = (); my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir -@@ -707,19 +722,8 @@ foreach my $lib (@modules_to_sync) { +@@ -706,19 +722,8 @@ foreach my $lib (@modules_to_sync) { chomp $line; if($line =~ /^ *QT *\+?= *([^\r\n]*)/) { foreach(split(/ /, $1)) { @@ -249,10 +251,10 @@ index f5b4f12..a58b879 100755 } } diff --git a/qtkernel/configure b/qtkernel/configure -index 11752c5..a137739 100755 +index 51f3f03..d4bcb59 100755 --- a/qtkernel/configure +++ b/qtkernel/configure -@@ -2395,8 +2395,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then +@@ -2540,8 +2540,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" echo "#!/bin/sh" >"$outpath/bin/syncqt" @@ -313,7 +315,7 @@ index 0000000..7d2e4b1 +@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); +@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index 6acaa77..5b37a75 100644 +index bd2225f..a653aa7 100644 --- a/qtkernel/tools/configure/configureapp.cpp +++ b/qtkernel/tools/configure/configureapp.cpp @@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv) @@ -328,5 +330,5 @@ index 6acaa77..5b37a75 100644 } } -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/0007-First-attempt-to-build-xmlpatterns.patch b/patches/0007-First-attempt-to-build-xmlpatterns.patch index 4e531c2..2454b7d 100644 --- a/patches/0007-First-attempt-to-build-xmlpatterns.patch +++ b/patches/0007-First-attempt-to-build-xmlpatterns.patch @@ -1,4 +1,4 @@ -From 4ed8256bab133035bb6865cf367348938c0f84fa Mon Sep 17 00:00:00 2001 +From 524428f40ec5bae3961dfe4f1f9b5b70236c6fdf Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Tue, 16 Nov 2010 14:34:35 +0100 Subject: [PATCH] First attempt to build xmlpatterns. @@ -10,10 +10,10 @@ Subject: [PATCH] First attempt to build xmlpatterns. create mode 100644 qtxmlpatterns/sync.profile diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -index 749c383..e69ab5f 100644 +index d7db65c..faeec54 100644 --- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro +++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -@@ -11,6 +11,9 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore \ +@@ -11,6 +11,9 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ QtNetwork include($$QT_SOURCE_TREE/src/qbase.pri) PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h diff --git a/patches/0009-First-attempt-to-build-script.patch b/patches/0009-First-attempt-to-build-script.patch index 23ae5cd..b862c8e 100644 --- a/patches/0009-First-attempt-to-build-script.patch +++ b/patches/0009-First-attempt-to-build-script.patch @@ -1,16 +1,16 @@ -From 8b4823f44044b5ca8cb6222d788c42f8924f4d85 Mon Sep 17 00:00:00 2001 +From 6004f320fc98d83e2c3de19b305b3d8604f4a665 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Fri, 19 Nov 2010 11:57:48 +0100 Subject: [PATCH] First attempt to build script. --- - qtscript/src/script/script.pro | 23 ++++++++++------------- + qtscript/src/script/script.pro | 21 +++++++++------------ qtscript/sync.profile | 10 ++++++++++ - 2 files changed, 20 insertions(+), 13 deletions(-) + 2 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 qtscript/sync.profile diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro -index 63917b1..b34b795 100644 +index 34f4a88..6e1e598 100644 --- a/qtscript/src/script/script.pro +++ b/qtscript/src/script/script.pro @@ -1,3 +1,5 @@ @@ -21,7 +21,7 @@ index 63917b1..b34b795 100644 QT = core @@ -9,22 +11,13 @@ DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO - unix:QMAKE_PKGCONFIG_REQUIRES = QtCore + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore -include(../qbase.pri) +include($$QT_SOURCE_TREE/src/qbase.pri) @@ -46,7 +46,7 @@ index 63917b1..b34b795 100644 include($$WEBKITDIR/WebKit.pri) # Disable a few warnings on Windows. -@@ -46,6 +39,10 @@ mac { +@@ -54,6 +47,10 @@ qpa:mac { include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) diff --git a/patches/0010-First-attempt-to-build-scripttools.patch b/patches/0010-First-attempt-to-build-scripttools.patch index d386ae2..bcd5f19 100644 --- a/patches/0010-First-attempt-to-build-scripttools.patch +++ b/patches/0010-First-attempt-to-build-scripttools.patch @@ -1,4 +1,4 @@ -From 227d20f079789c8973affb529b3dcc9db32e5b3e Mon Sep 17 00:00:00 2001 +From cc38b9720e504b0c46c26fe3fad81b76d1dbdf34 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Fri, 19 Nov 2010 13:58:03 +0100 Subject: [PATCH] First attempt to build scripttools. @@ -9,7 +9,7 @@ Subject: [PATCH] First attempt to build scripttools. 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/qtscript/src/scripttools/scripttools.pro b/qtscript/src/scripttools/scripttools.pro -index b1df7aa..7cadca9 100644 +index 061dea5..08a7b51 100644 --- a/qtscript/src/scripttools/scripttools.pro +++ b/qtscript/src/scripttools/scripttools.pro @@ -1,3 +1,5 @@ @@ -20,7 +20,7 @@ index b1df7aa..7cadca9 100644 QT = core gui script @@ -7,9 +9,14 @@ DEFINES += QT_NO_USING_NAMESPACE - unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript -include(../qbase.pri) - diff --git a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch index d105e91..6f19175 100644 --- a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch +++ b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch @@ -1,4 +1,4 @@ -From e2a8fde6428f6f1cafe5cd3509f3b723fee468b0 Mon Sep 17 00:00:00 2001 +From 57a3cc555e65d07507375d9ffa0a796b38f8063a Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 20:21:06 -0600 Subject: [PATCH] Add module specific pris, and make syncqt create fwd includes @@ -53,12 +53,12 @@ for syncqt to create the fwding pris in QtKernel. create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index e9bb124..fa0fbd3 100755 +index 7e5fc44..bceab27 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt -@@ -21,8 +21,16 @@ our $out_basedir = getcwd(); - $out_basedir =~ s=\\=/=g; - our $basedir; +@@ -23,8 +23,16 @@ our $basedir; + our $quoted_basedir; + +# try to figure out where QtKernel is located +# normally the script location should be enough, if not fall back to @@ -74,7 +74,7 @@ index e9bb124..fa0fbd3 100755 # global variables (modified by options) my $isunix = 0; -@@ -36,6 +44,7 @@ my $check_includes = 0; +@@ -38,6 +46,7 @@ my $check_includes = 0; my $copy_headers = 0; my $create_uic_class_map = 1; my $create_private_headers = 1; @@ -82,7 +82,7 @@ index e9bb124..fa0fbd3 100755 my @modules_to_sync ; $force_relative = 1 if ( -d "/System/Library/Frameworks" ); -@@ -60,9 +69,12 @@ sub showUsage +@@ -62,9 +71,12 @@ sub showUsage print " -windows Force platform to Windows (default: " . ($force_win ? "yes" : "no") . ")\n"; print " -showonly Show action but not perform (default: " . ($showonly ? "yes" : "no") . ")\n"; print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; @@ -179,25 +179,25 @@ index e9bb124..fa0fbd3 100755 } unless($showonly || !$create_uic_class_map) { diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf -index 19e01a1..0da44e9 100644 +index de1cac4..2973c7e 100644 --- a/qtkernel/mkspecs/features/qt_config.prf +++ b/qtkernel/mkspecs/features/qt_config.prf -@@ -11,7 +11,14 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - debug(1, "Cannot load qconfig.pri!") - } else { - debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") -- for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod) -+ for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))) { -+ # For installed Qt these paths will be common for all modules -+ # For development these will vary per module, and syncqt will override the value in the -+ # qt_<module>.pri forwarding file -+ QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] -+ QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] -+ include($$mod) -+ } +@@ -14,7 +14,14 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { + for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \ + $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) { + debug(1, "Loading modules from $${dir}") +- for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod) ++ for(mod, $$list($$files($$dir/modules/qt_*.pri))) { ++ # For installed Qt these paths will be common for all modules ++ # For development these will vary per module, and syncqt will override the value in the ++ # qt_<module>.pri forwarding file ++ QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] ++ QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] ++ include($$mod) ++ } + } } - load(qt_functions) diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri new file mode 100644 index 0000000..742aefe diff --git a/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch b/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch index bfc3bab..7341595 100644 --- a/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch +++ b/patches/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch @@ -1,4 +1,4 @@ -From 6dc10c9e00294cf3f35bc1ead04cba6293ec7236 Mon Sep 17 00:00:00 2001 +From 0a0937aa7ed1c3c5887ea8a5952474e1d6446d90 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 11:51:57 -0600 Subject: [PATCH] Add resolve_depends(var, prefix) function to qmake @@ -20,7 +20,7 @@ function. 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/qtkernel/qmake/project.cpp b/qtkernel/qmake/project.cpp -index 9c99c44..71d09f1 100644 +index 7cc1cb6..5e2306d 100644 --- a/qtkernel/qmake/project.cpp +++ b/qtkernel/qmake/project.cpp @@ -81,7 +81,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST @@ -40,7 +40,7 @@ index 9c99c44..71d09f1 100644 } return *qmake_expand_functions; } -@@ -1804,6 +1805,39 @@ QMakeProject::doProjectExpand(QString func, QStringList args, +@@ -1801,6 +1802,39 @@ QMakeProject::doProjectExpand(QString func, QStringList args, // defined in symbian generator extern QString generate_test_uid(const QString& target); @@ -80,7 +80,7 @@ index 9c99c44..71d09f1 100644 QStringList QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, QMap<QString, QStringList> &place) -@@ -2250,6 +2284,16 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, +@@ -2247,6 +2281,16 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, ret += generate_test_uid(args.first()); } break; diff --git a/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch b/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch index 5b4324c..4719720 100644 --- a/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch +++ b/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch @@ -1,4 +1,4 @@ -From c05aff02de2a55c1259d2e9576b57a692f5fd443 Mon Sep 17 00:00:00 2001 +From 44f9c53a3de443994189f98aa940f7e8aa255153 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 22:20:01 -0600 Subject: [PATCH] Make qt.prf use new qt_module.pri structure for QT variable @@ -11,7 +11,7 @@ This change requires the new resolve_depends(var, prefix) function in qmake. 3 files changed, 82 insertions(+), 72 deletions(-) diff --git a/qtkernel/mkspecs/features/qt.prf b/qtkernel/mkspecs/features/qt.prf -index e59319f..3b9c645 100644 +index 191a449..4d8e465 100644 --- a/qtkernel/mkspecs/features/qt.prf +++ b/qtkernel/mkspecs/features/qt.prf @@ -35,19 +35,6 @@ plugin { #Qt plugins @@ -121,10 +121,10 @@ index e59319f..3b9c645 100644 qt_compat { diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index 59d49c6..043c028 100644 +index 1fb6298..9182f87 100644 --- a/qtkernel/mkspecs/features/qt_functions.prf +++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -87,6 +87,69 @@ defineTest(qtAddLibrary) { +@@ -92,6 +92,69 @@ defineTest(qtAddLibrary) { return(true) } @@ -195,7 +195,7 @@ index 59d49c6..043c028 100644 defineTest(qtPrepareTool) { isEmpty($$1) { diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index 3a40928..5ac139f 100644 +index 4d835bd..08f4758 100644 --- a/qtkernel/src/qbase.pri +++ b/qtkernel/src/qbase.pri @@ -1,5 +1,7 @@ diff --git a/patches/0016-Make-modules-compile-without-hardcoded-paths.patch b/patches/0016-Make-modules-compile-without-hardcoded-paths.patch index 51d504b..5196d66 100644 --- a/patches/0016-Make-modules-compile-without-hardcoded-paths.patch +++ b/patches/0016-Make-modules-compile-without-hardcoded-paths.patch @@ -1,4 +1,4 @@ -From 952c2e0bdf820d0e89d6104463329bf3c8dde181 Mon Sep 17 00:00:00 2001 +From c575551eb611001643cc6dce796a4a6e58ee84dd Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 13:21:56 -0600 Subject: [PATCH] Make modules compile without hardcoded paths @@ -10,7 +10,7 @@ Subject: [PATCH] Make modules compile without hardcoded paths 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qtkernel/src/corelib/corelib.pro b/qtkernel/src/corelib/corelib.pro -index a001940..636c43f 100644 +index e946d5d..96f047c 100644 --- a/qtkernel/src/corelib/corelib.pro +++ b/qtkernel/src/corelib/corelib.pro @@ -1,3 +1,4 @@ @@ -19,7 +19,7 @@ index a001940..636c43f 100644 QPRO_PWD = $$PWD QT = diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index 5ac139f..45c0d81 100644 +index 08f4758..1742b0a 100644 --- a/qtkernel/src/qbase.pri +++ b/qtkernel/src/qbase.pri @@ -1,3 +1,6 @@ @@ -29,7 +29,7 @@ index 5ac139f..45c0d81 100644 isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) -@@ -14,7 +17,7 @@ mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm +@@ -13,7 +16,7 @@ isEmpty(QT_MAJOR_VERSION) { #load up the headers info CONFIG += qt_install_headers @@ -39,10 +39,10 @@ index 5ac139f..45c0d81 100644 #version overriding diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -index e69ab5f..749c383 100644 +index faeec54..d7db65c 100644 --- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro +++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -@@ -11,9 +11,6 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore \ +@@ -11,9 +11,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ QtNetwork include($$QT_SOURCE_TREE/src/qbase.pri) PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h diff --git a/patches/0018-Update-qtscript-by-following-the-new-method.patch b/patches/0018-Update-qtscript-by-following-the-new-method.patch index 5080ee6..7122ed0 100644 --- a/patches/0018-Update-qtscript-by-following-the-new-method.patch +++ b/patches/0018-Update-qtscript-by-following-the-new-method.patch @@ -1,4 +1,4 @@ -From 154bdaf5588e55544deeef9e55961049f5662858 Mon Sep 17 00:00:00 2001 +From 7dd08edfb3d97293aafc8cd45d7efb85da0762cc Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Thu, 25 Nov 2010 14:43:30 +0100 Subject: [PATCH] Update qtscript by following the new method. @@ -44,10 +44,10 @@ index 0000000..2ed4324 +QT.scripttools.libs = $$QT_MODULE_LIB_BASE +QT.scripttools.depends = script gui network diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro -index bc31404..da8a3c5 100644 +index 6e1e598..3d01850 100644 --- a/qtscript/src/script/script.pro +++ b/qtscript/src/script/script.pro -@@ -39,10 +39,6 @@ mac { +@@ -47,10 +47,6 @@ qpa:mac { include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) @@ -59,7 +59,7 @@ index bc31404..da8a3c5 100644 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler diff --git a/qtscript/src/scripttools/scripttools.pro b/qtscript/src/scripttools/scripttools.pro -index 7cadca9..41a7359 100644 +index 08a7b51..a42eb6a 100644 --- a/qtscript/src/scripttools/scripttools.pro +++ b/qtscript/src/scripttools/scripttools.pro @@ -13,10 +13,4 @@ include($$QT_SOURCE_TREE/src/qbase.pri) diff --git a/patches/0019-Make-declarative-compile.patch b/patches/0019-Make-declarative-compile.patch index 3ad3241..604f41e 100644 --- a/patches/0019-Make-declarative-compile.patch +++ b/patches/0019-Make-declarative-compile.patch @@ -1,4 +1,4 @@ -From 3bbd05c0c6869e6b38e6c55c28f05cf43033319c Mon Sep 17 00:00:00 2001 +From b3830c1df598ce7edd3e0e9420b9d8cae03c3632 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Thu, 25 Nov 2010 15:20:01 +0100 Subject: [PATCH] Make declarative compile. @@ -29,7 +29,7 @@ index 0000000..5fb8c25 +QT.declarative.libs = $$QT_MODULE_LIB_BASE +QT.declarative.depends = gui script network diff --git a/qtquick/src/declarative/declarative.pro b/qtquick/src/declarative/declarative.pro -index 1ad888b..c524643 100644 +index 6bd314f..680e0f9 100644 --- a/qtquick/src/declarative/declarative.pro +++ b/qtquick/src/declarative/declarative.pro @@ -1,3 +1,5 @@ @@ -47,7 +47,7 @@ index 1ad888b..c524643 100644 #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET #DESTDIR=. -@@ -30,5 +32,5 @@ symbian: { +@@ -37,5 +39,5 @@ symbian: { } DEFINES += QT_NO_OPENTYPE diff --git a/patches/0025-Make-tools-compile.patch b/patches/0025-Make-tools-compile.patch index 8457e77..aa8c16e 100644 --- a/patches/0025-Make-tools-compile.patch +++ b/patches/0025-Make-tools-compile.patch @@ -1,4 +1,4 @@ -From ab1b3dd6b657290418adbc76127b0ff45437fc66 Mon Sep 17 00:00:00 2001 +From 401dc79ff99a6648eb1a0f3bb6421883c085f12d Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Tue, 11 Jan 2011 08:40:22 +0100 Subject: [PATCH] Make tools compile. @@ -6,7 +6,7 @@ Subject: [PATCH] Make tools compile. --- qttools/modules/qt_designer.pri | 10 ++++++++++ qttools/modules/qt_uitools.pri | 10 ++++++++++ - .../src/assistant/tools/assistant/assistant.pro | 4 +++- + .../src/assistant/tools/assistant/assistant.pro | 6 +++--- .../qcollectiongenerator/qcollectiongenerator.pro | 3 ++- .../tools/qhelpconverter/qhelpconverter.pro | 2 +- .../tools/qhelpgenerator/qhelpgenerator.pro | 2 +- @@ -21,7 +21,7 @@ Subject: [PATCH] Make tools compile. qttools/src/qttracereplay/qttracereplay.pro | 4 +++- qttools/src/src.pro | 3 +-- qttools/sync.profile | 13 +++++++++++++ - 17 files changed, 73 insertions(+), 22 deletions(-) + 17 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 qttools/modules/qt_designer.pri create mode 100644 qttools/modules/qt_uitools.pri @@ -58,7 +58,7 @@ index 0000000..516afef +QT.uitools.libs = $$QT_MODULE_LIB_BASE +QT.uitools.depends = xml diff --git a/qttools/src/assistant/tools/assistant/assistant.pro b/qttools/src/assistant/tools/assistant/assistant.pro -index d9aff7a..f3dff14 100644 +index 7f0fdd1..dd79c10 100644 --- a/qttools/src/assistant/tools/assistant/assistant.pro +++ b/qttools/src/assistant/tools/assistant/assistant.pro @@ -1,3 +1,4 @@ @@ -66,7 +66,7 @@ index d9aff7a..f3dff14 100644 include(../../../shared/fontpanel/fontpanel.pri) TEMPLATE = app LANGUAGE = C++ -@@ -6,12 +7,13 @@ contains(QT_CONFIG, webkit):QT += webkit +@@ -6,14 +7,13 @@ contains(QT_CONFIG, webkit):QT += webkit CONFIG += qt \ warn_on \ help @@ -77,6 +77,8 @@ index d9aff7a..f3dff14 100644 target.path = $$[QT_INSTALL_BINS] INSTALLS += target DEPENDPATH += ../shared +-DEPENDPATH += . +-INCLUDEPATH += . +INCLUDEPATH += $$QT.help.includes # ## Work around a qmake issue when statically linking to @@ -117,7 +119,7 @@ index 68efcf5..82bec1d 100644 target.path=$$[QT_INSTALL_BINS] INSTALLS += target diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro -index 0ada845..c3dd3ff 100644 +index 50a8b00..165315e 100644 --- a/qttools/src/designer/src/components/lib/lib.pro +++ b/qttools/src/designer/src/components/lib/lib.pro @@ -1,12 +1,13 @@ @@ -161,7 +163,7 @@ index 8564e96..42cd345 100644 build_all:!build_pass { CONFIG -= build_all diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro -index 495976d..8e94831 100644 +index 3ba6f52..4e0e2b2 100644 --- a/qttools/src/designer/src/lib/lib.pro +++ b/qttools/src/designer/src/lib/lib.pro @@ -1,11 +1,14 @@ @@ -183,7 +185,7 @@ index 495976d..8e94831 100644 VERSION=4.3.0 @@ -15,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) { - unix:QMAKE_PKGCONFIG_REQUIRES += QtXml + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml -include(../../../../src/qt_targets.pri) +include($$QT_SOURCE_TREE/src/qt_targets.pri) @@ -299,7 +301,7 @@ index cc5b98d..691a66b 100644 # Input diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index 03a8f7c..c405f04 100644 +index 7b0b114..6491236 100644 --- a/qttools/src/src.pro +++ b/qttools/src/src.pro @@ -11,7 +11,6 @@ TEMPLATE = subdirs @@ -314,8 +316,8 @@ index 03a8f7c..c405f04 100644 SUBDIRS += designer } } -- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig -+# unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig +- unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig ++# unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } } @@ -350,5 +352,5 @@ index c6aaf0e..443b891 100644 + "QtUiTools" => "$basedir/modules/qt_uitools.pri", ); -- -1.7.0.4 +1.7.3.2.343.g7d43d diff --git a/patches/0027-Move-QtSvg-into-a-separate-repository.patch b/patches/0027-Move-QtSvg-into-a-separate-repository.patch index bdf922d..5ff987b 100644 --- a/patches/0027-Move-QtSvg-into-a-separate-repository.patch +++ b/patches/0027-Move-QtSvg-into-a-separate-repository.patch @@ -1,4 +1,4 @@ -From 66106fb9116df7b034ac751d691fe0e9399f39f7 Mon Sep 17 00:00:00 2001 +From aeffc8a9c04de49386e3476fd4d41d5c9416fdd6 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Mon, 27 Dec 2010 14:49:29 +0100 Subject: [PATCH] Move QtSvg into a separate repository @@ -29,7 +29,7 @@ index 5fff2de..66dea09 100644 !contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff !contains(QT_CONFIG, no-ico):SUBDIRS += ico diff --git a/qtkernel/src/plugins/plugins.pro b/qtkernel/src/plugins/plugins.pro -index fce7e3a..cf751e9 100644 +index d0d7188..c1aff35 100644 --- a/qtkernel/src/plugins/plugins.pro +++ b/qtkernel/src/plugins/plugins.pro @@ -6,7 +6,7 @@ unix:!symbian { @@ -38,14 +38,14 @@ index fce7e3a..cf751e9 100644 } -!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines +!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats - !embedded:SUBDIRS *= graphicssystems + !embedded:!qpa:SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro -index b64bf9c..b6d6e4c 100644 +index 6da0877..2f65a08 100644 --- a/qtkernel/src/src.pro +++ b/qtkernel/src/src.pro -@@ -12,7 +12,6 @@ SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml +@@ -13,7 +13,6 @@ nacl: SRC_SUBDIRS -= src_network src_testlib contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg @@ -53,7 +53,7 @@ index b64bf9c..b6d6e4c 100644 SRC_SUBDIRS += src_plugins # s60installs need to be at the end, because qtkernel.pro does an ordered build, -@@ -37,8 +36,6 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql +@@ -38,8 +37,6 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql src_sql.target = sub-sql src_network.subdir = $$QT_SOURCE_TREE/src/network src_network.target = sub-network @@ -62,7 +62,7 @@ index b64bf9c..b6d6e4c 100644 src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl src_opengl.target = sub-opengl src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg -@@ -55,7 +52,6 @@ src_testlib.target = sub-testlib +@@ -56,7 +53,6 @@ src_testlib.target = sub-testlib embedded: src_gui.depends += src_network src_xml.depends = src_corelib src_dbus.depends = src_corelib src_xml @@ -70,7 +70,7 @@ index b64bf9c..b6d6e4c 100644 src_network.depends = src_corelib src_opengl.depends = src_gui src_openvg.depends = src_gui -@@ -63,7 +59,7 @@ src_testlib.target = sub-testlib +@@ -64,7 +60,7 @@ src_testlib.target = sub-testlib src_testlib.depends = src_corelib src_tools_idc.depends = src_corelib # target defined in tools.pro src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro @@ -79,7 +79,7 @@ index b64bf9c..b6d6e4c 100644 src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { -@@ -71,9 +67,6 @@ src_testlib.target = sub-testlib +@@ -72,9 +68,6 @@ src_testlib.target = sub-testlib src_declarative.depends += src_opengl src_webkit.depends += src_opengl } @@ -176,7 +176,7 @@ index bcf4c21..c3412b9 100644 INSTALLS += target diff --git a/qtsvg/src/svg/svg.pro b/qtsvg/src/svg/svg.pro -index 7b5251a..e3bee38 100644 +index 79f284a..3572d59 100644 --- a/qtsvg/src/svg/svg.pro +++ b/qtsvg/src/svg/svg.pro @@ -1,3 +1,5 @@ @@ -187,7 +187,7 @@ index 7b5251a..e3bee38 100644 QT = core gui @@ -8,8 +10,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -include(../qbase.pri) - diff --git a/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch b/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch index 90354da..a94491a 100644 --- a/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch +++ b/patches/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch @@ -1,4 +1,4 @@ -From e57c27385ea72d677633d9dcfd19f7634d57ae9a Mon Sep 17 00:00:00 2001 +From 9db33c8d9be3bcdbc0b26b2243c9f6da6cf39caa Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 3 Jan 2011 13:09:28 -0600 Subject: [PATCH] Add hardcoded qclass_lib_map.h based on 4.8 @@ -11,10 +11,10 @@ This is only until UIC/Designer handles this properly create mode 100644 qtkernel/src/tools/uic/qclass_lib_map.h diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 8b69ffb..dd46bee 100755 +index afe873f..0894c80 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt -@@ -42,7 +42,7 @@ my $force_win = 0; +@@ -44,7 +44,7 @@ my $force_win = 0; my $force_relative = 0; my $check_includes = 0; my $copy_headers = 0; diff --git a/patches/0030-Make-phonon-compile.patch b/patches/0030-Make-phonon-compile.patch index 810cea2..6c8258d 100644 --- a/patches/0030-Make-phonon-compile.patch +++ b/patches/0030-Make-phonon-compile.patch @@ -1,4 +1,4 @@ -From 04d60d8c14daa3597e01ff47355be13c18fa53dd Mon Sep 17 00:00:00 2001 +From a7edaadefe2df875c42bd3a87ce61db800abaf85 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Wed, 29 Dec 2010 07:55:52 +0100 Subject: [PATCH] Make phonon compile @@ -45,7 +45,7 @@ index 0000000..0da9087 +SUBDIRS += src \ +# examples \ diff --git a/phonon/src/phonon/phonon.pro b/phonon/src/phonon/phonon.pro -index 7f79d0b..d9d48db 100644 +index b16c5a1..9da6a25 100644 --- a/phonon/src/phonon/phonon.pro +++ b/phonon/src/phonon/phonon.pro @@ -1,5 +1,8 @@ @@ -65,7 +65,7 @@ index 7f79d0b..d9d48db 100644 -PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon +PHONON_DIR = ../3rdparty/phonon/phonon - unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork diff --git a/phonon/src/plugins/phonon/ds9/ds9.pro b/phonon/src/plugins/phonon/ds9/ds9.pro index 301808e..4b6c0e7 100644 @@ -93,7 +93,7 @@ index 301808e..4b6c0e7 100644 -include(../../qpluginbase.pri) +include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) diff --git a/phonon/src/plugins/phonon/gstreamer/gstreamer.pro b/phonon/src/plugins/phonon/gstreamer/gstreamer.pro -index 1013205..776c28b 100644 +index c0d2604..1df4a78 100644 --- a/phonon/src/plugins/phonon/gstreamer/gstreamer.pro +++ b/phonon/src/plugins/phonon/gstreamer/gstreamer.pro @@ -1,3 +1,5 @@ @@ -118,7 +118,7 @@ index 1013205..776c28b 100644 -include(../../qpluginbase.pri) +include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) diff --git a/phonon/src/plugins/phonon/mmf/mmf.pro b/phonon/src/plugins/phonon/mmf/mmf.pro -index de00c9e..815fdc0 100644 +index 7c7c1d7..9bf50c7 100644 --- a/phonon/src/plugins/phonon/mmf/mmf.pro +++ b/phonon/src/plugins/phonon/mmf/mmf.pro @@ -1,8 +1,10 @@ @@ -142,7 +142,7 @@ index de00c9e..815fdc0 100644 INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE -@@ -136,7 +138,7 @@ symbian { +@@ -140,7 +142,7 @@ symbian { target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target diff --git a/patches/0033-Fixed-useless-substitution-in-syncqt.patch b/patches/0033-Fixed-useless-substitution-in-syncqt.patch index 9ad7e19..8dda471 100644 --- a/patches/0033-Fixed-useless-substitution-in-syncqt.patch +++ b/patches/0033-Fixed-useless-substitution-in-syncqt.patch @@ -1,4 +1,4 @@ -From 39430d7b8f62abe138efecd76654983f4e0ef382 Mon Sep 17 00:00:00 2001 +From bb2e4aa4a3817a890e20335511559e534eb2bc7c Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 3 Jan 2011 19:18:14 +0100 Subject: [PATCH] Fixed useless substitution in syncqt. @@ -10,17 +10,17 @@ passed in. 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 88adcb3..cffd832 100755 +index 0894c80..5a72636 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt -@@ -301,7 +301,6 @@ sub syncHeader { +@@ -303,7 +303,6 @@ sub syncHeader { ###################################################################### sub fixPaths { my ($file, $dir) = @_; -- $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir)); +- $dir =~ s=^$quoted_basedir/=$out_basedir/= if(!($basedir eq $out_basedir)); $file =~ s=\\=/=g; - $file =~ s/\+/\\+/g; $dir =~ s=\\=/=g; + -- 1.7.3.2.343.g7d43d diff --git a/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch b/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch index 0ab5c96..efb0a79 100644 --- a/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch +++ b/patches/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch @@ -1,7 +1,7 @@ -From b7cd2b6bf1ae149ed9262f09d8543a0d3c5bbdca Mon Sep 17 00:00:00 2001 +From 629ac41df49f85b7b703beb2a342ba7caef5ceb2 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 3 Jan 2011 22:54:07 +0100 -Subject: [PATCH] Made the internal support for Qt3Support in QtGui compile. +Subject: [PATCH 35/84] Made the internal support for Qt3Support in QtGui compile. --- qtkernel/src/qbase.pri | 2 +- @@ -9,20 +9,20 @@ Subject: [PATCH] Made the internal support for Qt3Support in QtGui compile. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index 45c0d81..c6d873a 100644 +index f8ababb..a875a56 100644 --- a/qtkernel/src/qbase.pri +++ b/qtkernel/src/qbase.pri -@@ -159,7 +159,7 @@ unix:!symbian { +@@ -166,7 +166,7 @@ win32-g++* { contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS -contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT -+contains(QT_ELIGIBLE_MODULES, qt3support):DEFINES *= QT3_SUPPORT ++contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION diff --git a/qtkernel/src/tools/uic/uic.pro b/qtkernel/src/tools/uic/uic.pro -index 9b63d42..050db2e 100644 +index 9b63d42..591925c 100644 --- a/qtkernel/src/tools/uic/uic.pro +++ b/qtkernel/src/tools/uic/uic.pro @@ -6,7 +6,7 @@ DEFINES += QT_UIC @@ -30,10 +30,10 @@ index 9b63d42..050db2e 100644 DEPENDPATH += . -!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT -+!contains(QT_ELIGIBLE_MODULES, qt3support):DEFINES += QT_NO_QT3_SUPPORT ++!contains(QT_CONFIG, gui-qt3support):DEFINES += QT_NO_QT3_SUPPORT include(uic.pri) include(cpp/cpp.pri) -- -1.7.3.2.343.g7d43d +1.7.2.2 diff --git a/patches/0037-Make-each-module-refer-to-its-own-bin.patch b/patches/0037-Make-each-module-refer-to-its-own-bin.patch index ee10894..a4eacc9 100644 --- a/patches/0037-Make-each-module-refer-to-its-own-bin.patch +++ b/patches/0037-Make-each-module-refer-to-its-own-bin.patch @@ -1,4 +1,4 @@ -From c098ba2ef7475c7881bbfb9b615eadf34c8025f4 Mon Sep 17 00:00:00 2001 +From d471a1a923941bf623ea6f966c7850c1a77be17f Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 6 Jan 2011 12:52:17 -0600 Subject: [PATCH] Make each module refer to its own bin/ @@ -55,7 +55,7 @@ index 06754db..e2526f8 100644 QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 5529359..0dcba24 100755 +index 2dcbaf3..0433240 100755 --- a/qtkernel/bin/syncqt +++ b/qtkernel/bin/syncqt @@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) { @@ -67,22 +67,22 @@ index 5529359..0dcba24 100755 print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; print MODULE_PRI_FILE "include($modulepri)\n"; diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf -index 0da44e9..b348495 100644 +index 2973c7e..7e80ad3 100644 --- a/qtkernel/mkspecs/features/qt_config.prf +++ b/qtkernel/mkspecs/features/qt_config.prf -@@ -17,6 +17,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - # qt_<module>.pri forwarding file - QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] - QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] -+ QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] - include($$mod) +@@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { + # qt_<module>.pri forwarding file + QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] + QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] ++ QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] + include($$mod) + } } - } diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index f716e01..d6fc0e3 100644 +index 9182f87..a145b9d 100644 --- a/qtkernel/mkspecs/features/qt_functions.prf +++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -152,10 +152,13 @@ defineTest(qtAddModule) { +@@ -157,10 +157,13 @@ defineTest(qtAddModule) { # variable, default defineTest(qtPrepareTool) { diff --git a/patches/0039-examples.pro-removed-moved-subdirectories.patch b/patches/0039-examples.pro-removed-moved-subdirectories.patch index 5a13222..aaae52a 100644 --- a/patches/0039-examples.pro-removed-moved-subdirectories.patch +++ b/patches/0039-examples.pro-removed-moved-subdirectories.patch @@ -1,4 +1,4 @@ -From 69acc00d226d00bfb257a9950dce9bcae3abc4a8 Mon Sep 17 00:00:00 2001 +From f9d03ea8c2134c5131cf19217098eca4e022e933 Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Fri, 7 Jan 2011 13:46:25 +0100 Subject: [PATCH] examples.pro removed moved subdirectories @@ -8,10 +8,10 @@ Subject: [PATCH] examples.pro removed moved subdirectories 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/qtkernel/examples/examples.pro b/qtkernel/examples/examples.pro -index 15436d2..5b66020 100644 +index f8294c4..ec0c1b0 100644 --- a/qtkernel/examples/examples.pro +++ b/qtkernel/examples/examples.pro -@@ -49,9 +49,6 @@ symbian: SUBDIRS = \ +@@ -50,9 +50,6 @@ symbian: SUBDIRS = \ SUBDIRS += multimedia } @@ -21,7 +21,7 @@ index 15436d2..5b66020 100644 embedded:SUBDIRS += qws !wince*:!symbian: { !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer -@@ -62,9 +59,6 @@ embedded:SUBDIRS += qws +@@ -63,9 +60,6 @@ embedded:SUBDIRS += qws contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, openvg): SUBDIRS += openvg contains(QT_CONFIG, dbus): SUBDIRS += dbus @@ -32,5 +32,5 @@ index 15436d2..5b66020 100644 contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent -- -1.7.3.5 +1.7.3.2.343.g7d43d diff --git a/patches/0041-Make-auto-test-build.patch b/patches/0041-Make-auto-test-build.patch index 46b4669..c04f6a7 100644 --- a/patches/0041-Make-auto-test-build.patch +++ b/patches/0041-Make-auto-test-build.patch @@ -1,4 +1,4 @@ -From acb4ab7087363227f96b7097e46e11b3caffc6cf Mon Sep 17 00:00:00 2001 +From 880f8a40fb25a1ff03bf6c51f3cf0c1236fe3867 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Fri, 7 Jan 2011 13:47:49 +0100 Subject: [PATCH] Make auto test build @@ -10,23 +10,14 @@ Subject: [PATCH] Make auto test build .../auto/q3sqlselectcursor/q3sqlselectcursor.pro | 2 ++ .../q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 2 +- qtkernel/tests/auto/auto.pro | 10 ---------- - qtkernel/tests/auto/gui.pro | 2 +- - qtkernel/tests/auto/host.pro | 5 +---- - qtkernel/tests/auto/network.pro | 4 ++-- - qtkernel/tests/auto/other.pro | 2 +- .../tests/auto/declarative/examples/examples.pro | 2 +- .../qdeclarativesqldatabase.pro | 2 +- .../qdeclarativeviewer/qdeclarativeviewer.pro | 2 +- - qttools/tests/auto/auto.pro | 3 +++ - qttools/tests/auto/help.pro | 7 +++++++ .../qapplicationargumentparser.pro | 2 +- .../auto/xmlpatternsschema/xmlpatternsschema.pro | 4 +++- .../tests/auto/xmlpatternssdk/xmlpatternssdk.pro | 7 ++++--- - 19 files changed, 39 insertions(+), 28 deletions(-) + 12 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 phonon/tests/auto/auto.pro - create mode 100644 qttools/tests/auto/auto.pro - create mode 100644 qttools/tests/auto/help.pro - create mode 100644 qtwebkit/tests/auto/auto.pro diff --git a/phonon/tests/auto/auto.pro b/phonon/tests/auto/auto.pro new file mode 100644 @@ -108,75 +99,8 @@ index c677249..02e8b5b 100644 -contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro -!symbian SUBDIRS += help.pro - -diff --git a/qtkernel/tests/auto/gui.pro b/qtkernel/tests/auto/gui.pro -index 4b809fb..5dc9c58 100644 ---- a/qtkernel/tests/auto/gui.pro -+++ b/qtkernel/tests/auto/gui.pro -@@ -113,7 +113,7 @@ SUBDIRS=\ - qnetworkaccessmanager_and_qprogressdialog \ - qnetworkcachemetadata \ - qnetworkdiskcache \ -- qnetworkreply \ -+# qnetworkreply \ - qpaintengine \ - qpainterpath \ - qpainterpathstroker \ -diff --git a/qtkernel/tests/auto/host.pro b/qtkernel/tests/auto/host.pro -index 9852d91..029c8b4 100644 ---- a/qtkernel/tests/auto/host.pro -+++ b/qtkernel/tests/auto/host.pro -@@ -1,6 +1,6 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- headers \ -+# headers \ - bic \ - compiler \ - compilerwarnings \ -@@ -14,6 +14,3 @@ SUBDIRS=\ - symbols \ - #atwrapper \ # These tests need significant updating, - #uiloader \ # they have hardcoded machine names etc. -- --contains(QT_CONFIG,qt3support):SUBDIRS+=uic3 -- -diff --git a/qtkernel/tests/auto/network.pro b/qtkernel/tests/auto/network.pro -index 7d83054..7b4159a 100644 ---- a/qtkernel/tests/auto/network.pro -+++ b/qtkernel/tests/auto/network.pro -@@ -13,7 +13,7 @@ SUBDIRS=\ - qhostaddress \ - qhostinfo \ - qhttp \ -- qhttpnetworkconnection \ -+# qhttpnetworkconnection \ - qhttpnetworkreply \ - qhttpsocketengine \ - qnativesocketengine \ -@@ -34,7 +34,7 @@ SUBDIRS=\ - qsslcipher \ - qsslerror \ - qsslkey \ -- qsslsocket \ -+# qsslsocket \ - # qnetworkproxyfactory \ # Uses a hardcoded proxy configuration - - !contains(QT_CONFIG, private_tests): SUBDIRS -= \ -diff --git a/qtkernel/tests/auto/other.pro b/qtkernel/tests/auto/other.pro -index 3c8f856..bc135ff 100644 ---- a/qtkernel/tests/auto/other.pro -+++ b/qtkernel/tests/auto/other.pro -@@ -5,7 +5,7 @@ TEMPLATE=subdirs - SUBDIRS=\ - # exceptionsafety_objects \ shouldn't enable it - qaccessibility \ -- qalgorithms \ -+# qalgorithms \ - qcombobox \ - qcssparser \ - qdatastream \ diff --git a/qtquick/tests/auto/declarative/examples/examples.pro b/qtquick/tests/auto/declarative/examples/examples.pro -index 2e243b4..c7135e5 100644 +index dafc146..fa632f0 100644 --- a/qtquick/tests/auto/declarative/examples/examples.pro +++ b/qtquick/tests/auto/declarative/examples/examples.pro @@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle @@ -186,10 +110,10 @@ index 2e243b4..c7135e5 100644 -include(../../../../tools/qml/qml.pri) +include(../../../../tools/qmlviewer/qml.pri) - symbian: { - importFiles.sources = data + include(../symbianlibs.pri) + diff --git a/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro -index 1462c9a..7498792 100644 +index 0d335a5..bce758a 100644 --- a/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -1,6 +1,6 @@ @@ -201,7 +125,7 @@ index 1462c9a..7498792 100644 SOURCES += tst_qdeclarativesqldatabase.cpp diff --git a/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro -index 6189916..34a111a 100644 +index 8d4b410..46a3dae 100644 --- a/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro +++ b/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -2,7 +2,7 @@ load(qttest_p4) @@ -213,28 +137,6 @@ index 6189916..34a111a 100644 SOURCES += tst_qdeclarativeviewer.cpp -diff --git a/qttools/tests/auto/auto.pro b/qttools/tests/auto/auto.pro -new file mode 100644 -index 0000000..e675e25c ---- /dev/null -+++ b/qttools/tests/auto/auto.pro -@@ -0,0 +1,3 @@ -+TEMPLATE = subdirs -+ -+SUBDIRS += help.pro -diff --git a/qttools/tests/auto/help.pro b/qttools/tests/auto/help.pro -new file mode 100644 -index 0000000..055703c ---- /dev/null -+++ b/qttools/tests/auto/help.pro -@@ -0,0 +1,7 @@ -+TEMPLATE = subdirs -+ -+SUBDIRS += qhelpcontentmodel \ -+ qhelpenginecore \ -+ qhelpgenerator \ -+ qhelpindexmodel \ -+ qhelpprojectdata diff --git a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro index df32e92..80e207f 100644 --- a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro @@ -282,5 +184,5 @@ index 6204f01..9ba9cb6 100644 HEADERS = ASTItem.h \ DebugExpressionFactory.h \ -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/0043-compile-qtquick-import.patch b/patches/0043-compile-qtquick-import.patch index dbb9f30..15f521a 100644 --- a/patches/0043-compile-qtquick-import.patch +++ b/patches/0043-compile-qtquick-import.patch @@ -1,4 +1,4 @@ -From e7d0806da22251d09cd428fd2ee56c415b24ab36 Mon Sep 17 00:00:00 2001 +From 5f3b10279c2c4068c16036e70624c60e666b1171 Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Tue, 11 Jan 2011 11:09:56 +0100 Subject: [PATCH] compile qtquick/import @@ -7,7 +7,7 @@ Subject: [PATCH] compile qtquick/import qtquick/src/imports/qimportbase.pri | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/qtquick/imports/qimportbase.pri b/qtquick/imports/qimportbase.pri +diff --git a/qtquick/src/imports/qimportbase.pri b/qtquick/src/imports/qimportbase.pri index 0f70030..b0d2181 100644 --- a/qtquick/src/imports/qimportbase.pri +++ b/qtquick/src/imports/qimportbase.pri @@ -29,5 +29,5 @@ index 0f70030..b0d2181 100644 wince*:LIBS += $$QMAKE_LIBS_GUI -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch b/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch index 9d1f000..453bc05 100644 --- a/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch +++ b/patches/0044-Move-uitools-from-QtTools-to-QtKernel.patch @@ -1,4 +1,4 @@ -From a7526c6929aadf191fa0c16f60e9130b5276894f Mon Sep 17 00:00:00 2001 +From 3196dfa2ae713f1c13384769f06400f4891fd1c4 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Wed, 12 Jan 2011 21:06:11 +0100 Subject: [PATCH] Move uitools from QtTools to QtKernel @@ -67,7 +67,7 @@ index c5160c5..1f4070c 100644 QT.uitools.depends = xml QT.uitools.DEFINES = QT_UITOOLS_LIB diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro -index b6d6e4c..57ab7c3 100644 +index 2f65a08..cd4b7f7 100644 --- a/qtkernel/src/src.pro +++ b/qtkernel/src/src.pro @@ -4,7 +4,7 @@ TEMPLATE = subdirs @@ -76,10 +76,10 @@ index b6d6e4c..57ab7c3 100644 symbian:SRC_SUBDIRS += src_s60main -SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml +SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml src_uitools + nacl: SRC_SUBDIRS -= src_network src_testlib !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui - -@@ -28,6 +28,8 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib +@@ -29,6 +29,8 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib src_corelib.target = sub-corelib src_xml.subdir = $$QT_SOURCE_TREE/src/xml src_xml.target = sub-xml @@ -88,7 +88,7 @@ index b6d6e4c..57ab7c3 100644 src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus src_dbus.target = sub-dbus src_gui.subdir = $$QT_SOURCE_TREE/src/gui -@@ -51,6 +53,7 @@ src_testlib.target = sub-testlib +@@ -52,6 +54,7 @@ src_testlib.target = sub-testlib src_gui.depends = src_corelib src_tools_uic embedded: src_gui.depends += src_network src_xml.depends = src_corelib @@ -97,7 +97,7 @@ index b6d6e4c..57ab7c3 100644 src_network.depends = src_corelib src_opengl.depends = src_gui diff --git a/qtkernel/src/uitools/uitools.pro b/qtkernel/src/uitools/uitools.pro -index 7b94587..abc4022 100644 +index 6e0a247..3ce29fa 100644 --- a/qtkernel/src/uitools/uitools.pro +++ b/qtkernel/src/uitools/uitools.pro @@ -1,9 +1,9 @@ @@ -376,7 +376,7 @@ index c2fc10d..1dd8cf0 100644 TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end +INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro -index c3dd3ff0..f973171 100644 +index 165315e..852ec23 100644 --- a/qttools/src/designer/src/components/lib/lib.pro +++ b/qttools/src/designer/src/components/lib/lib.pro @@ -48,7 +48,7 @@ INCLUDEPATH += . .. \ @@ -402,7 +402,7 @@ index 42cd345..b3de616 100644 QMAKE_LIBDIR += ../../lib ../../../../lib diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro -index 8e94831..1b47e22 100644 +index 4e0e2b2..a277f61 100644 --- a/qttools/src/designer/src/lib/lib.pro +++ b/qttools/src/designer/src/lib/lib.pro @@ -59,7 +59,8 @@ mac:!static:contains(QT_CONFIG, qt_framework) { diff --git a/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch index e0a189c..a65b350 100644 --- a/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch +++ b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch @@ -1,4 +1,4 @@ -From 72a815490ebe41eff5e128ed70ad351ec88514d9 Mon Sep 17 00:00:00 2001 +From 5dc1b2627551b3d0fd3227d032f1497349c4071c Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Fri, 14 Jan 2011 16:14:17 +0100 Subject: [PATCH] Added new QtWebKit requirements since we need more tools now. @@ -8,10 +8,10 @@ Subject: [PATCH] Added new QtWebKit requirements since we need more tools now. 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/qtdoc/doc/src/getting-started/installation.qdoc b/qtdoc/doc/src/getting-started/installation.qdoc -index 4b4dab5..df674a1 100644 +index 6d0256e..bbbffcc 100644 --- a/qtdoc/doc/src/getting-started/installation.qdoc +++ b/qtdoc/doc/src/getting-started/installation.qdoc -@@ -979,6 +979,31 @@ We hope you will enjoy using Qt. +@@ -980,6 +980,31 @@ We hope you will enjoy using Qt. \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=0baf2b35-c656-4969-ace8-e4c0c0716adb&DisplayLang=en}{here}. \endlist @@ -43,7 +43,7 @@ index 4b4dab5..df674a1 100644 \sa {Known Issues} */ -@@ -1131,6 +1156,27 @@ We hope you will enjoy using Qt. +@@ -1132,6 +1157,27 @@ We hope you will enjoy using Qt. distributions; try searching for \c gstreamer or \c libgstreamer in your distribution's package repository to find suitable packages. @@ -71,7 +71,7 @@ index 4b4dab5..df674a1 100644 \sa {Known Issues} */ -@@ -1295,5 +1341,19 @@ We hope you will enjoy using Qt. +@@ -1305,6 +1351,20 @@ We hope you will enjoy using Qt. We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start} to get more information about how to setup the development environment. @@ -91,6 +91,7 @@ index 4b4dab5..df674a1 100644 + \sa {Known Issues} */ + -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch b/patches/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch index 54b9c0a..0b6af0e 100644 --- a/patches/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch +++ b/patches/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch @@ -1,4 +1,4 @@ -From 6fea1b5c8d71c71d937ce103292783919a450bb9 Mon Sep 17 00:00:00 2001 +From 2d639fc2cd176f31748564d3465fa28fb89140f9 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 13 Jan 2011 08:30:22 -0600 Subject: [PATCH] Make configure.exe compile and handle "eligible modules" @@ -9,7 +9,7 @@ Subject: [PATCH] Make configure.exe compile and handle "eligible modules" 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index 78fb1b3..77621a5 100644 +index a653aa7..143570c 100644 --- a/qtkernel/tools/configure/configureapp.cpp +++ b/qtkernel/tools/configure/configureapp.cpp @@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv) @@ -21,7 +21,7 @@ index 78fb1b3..77621a5 100644 syncqt_bat.close(); } } -@@ -2638,7 +2638,7 @@ void Configure::generateOutputVars() +@@ -2662,7 +2662,7 @@ void Configure::generateOutputVars() qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]); if (dictionary[ "QT3SUPPORT" ] == "yes") @@ -30,7 +30,7 @@ index 78fb1b3..77621a5 100644 if (dictionary[ "OPENGL" ] == "yes") qtConfig += "opengl"; -@@ -2684,7 +2684,7 @@ void Configure::generateOutputVars() +@@ -2708,7 +2708,7 @@ void Configure::generateOutputVars() qtConfig += "cetest"; if (dictionary[ "SCRIPT" ] == "yes") @@ -39,7 +39,7 @@ index 78fb1b3..77621a5 100644 if (dictionary[ "SCRIPTTOOLS" ] == "yes") { if (dictionary[ "SCRIPT" ] == "no") { -@@ -2692,30 +2692,26 @@ void Configure::generateOutputVars() +@@ -2716,30 +2716,26 @@ void Configure::generateOutputVars() "disabled." << endl; dictionary[ "DONE" ] = "error"; } @@ -75,7 +75,7 @@ index 78fb1b3..77621a5 100644 if (dictionary["WEBKIT"] == "debug") qtConfig += "webkit-debug"; } -@@ -2726,7 +2722,7 @@ void Configure::generateOutputVars() +@@ -2750,7 +2746,7 @@ void Configure::generateOutputVars() "disabled." << endl; dictionary[ "DONE" ] = "error"; } @@ -84,7 +84,7 @@ index 78fb1b3..77621a5 100644 } if (dictionary[ "NATIVE_GESTURES" ] == "yes") -@@ -2875,81 +2871,81 @@ void Configure::generateCachefile() +@@ -2899,81 +2895,81 @@ void Configure::generateCachefile() } // Generate qmodule.pri @@ -200,7 +200,7 @@ index 78fb1b3..77621a5 100644 } // Generate qconfig.pri -@@ -3005,6 +3001,7 @@ void Configure::generateCachefile() +@@ -3029,6 +3025,7 @@ void Configure::generateCachefile() else configStream << "QT_EDITION = " << dictionary["EDITION"] << endl; configStream << "QT_CONFIG += " << qtConfig.join(" ") << endl; @@ -208,7 +208,7 @@ index 78fb1b3..77621a5 100644 configStream << "#versioning " << endl << "QT_VERSION = " << dictionary["VERSION"] << endl -@@ -3407,7 +3404,7 @@ void Configure::displayConfig() +@@ -3428,7 +3425,7 @@ void Configure::displayConfig() cout << "Configuration:" << endl; cout << " " << qmakeConfig.join("\r\n ") << endl; cout << "Qt Configuration:" << endl; diff --git a/patches/0053-Removed-activeqt-references-from-qttools-which-is-in.patch b/patches/0053-Removed-activeqt-references-from-qttools-which-is-in.patch index 3c00fda..2026b1b 100644 --- a/patches/0053-Removed-activeqt-references-from-qttools-which-is-in.patch +++ b/patches/0053-Removed-activeqt-references-from-qttools-which-is-in.patch @@ -1,20 +1,33 @@ -From d2c8642d0ce8e03f9f5451f96a66f2d0e62d7a2a Mon Sep 17 00:00:00 2001 +From a9d503ed7391eed0d1c2368434c1c1cc9aa039bb Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 24 Jan 2011 11:35:32 +0100 -Subject: [PATCH] Removed activeqt references from qttools, which is in its own repo. +Subject: [PATCH] Removed activeqt references from Designer, which is in its own repo. --- - qttools/src/src.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + qttools/src/designer/src/plugins/plugins.pro | 1 - + qttools/src/src.pro | 1 - + 2 files changed, 0 insertions(+), 2 deletions(-) +diff --git a/qttools/src/designer/src/plugins/plugins.pro b/qttools/src/designer/src/plugins/plugins.pro +index bcebb82..f9ef7ed 100644 +--- a/qttools/src/designer/src/plugins/plugins.pro ++++ b/qttools/src/designer/src/plugins/plugins.pro +@@ -3,7 +3,6 @@ CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) + contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt + # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview + contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index b156c8e..69c6457 100644 +index 54fca4a..562283b 100644 --- a/qttools/src/src.pro +++ b/qttools/src/src.pro @@ -20,7 +20,6 @@ TEMPLATE = subdirs } } - # unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig + # unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt } } diff --git a/patches/0055-Fixed-a-bug-in-libdir-handling.patch b/patches/0055-Fixed-a-bug-in-libdir-handling.patch index 30ccd47..521e957 100644 --- a/patches/0055-Fixed-a-bug-in-libdir-handling.patch +++ b/patches/0055-Fixed-a-bug-in-libdir-handling.patch @@ -1,4 +1,4 @@ -From 5ad822474acdfa17bc0679ec0157473571dbff0f Mon Sep 17 00:00:00 2001 +From 44fa418ce476d58bebb644b3777ebcb2a489f5c9 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 24 Jan 2011 10:14:42 +0100 Subject: [PATCH] Fixed a bug in libdir handling. @@ -10,10 +10,10 @@ MSVC does not understand -L. 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index 3567c8b..4eb4387 100644 +index a145b9d..312a0b2 100644 --- a/qtkernel/mkspecs/features/qt_functions.prf +++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -126,7 +126,7 @@ defineTest(qtAddModule) { +@@ -131,7 +131,7 @@ defineTest(qtAddModule) { isEmpty(LINKAGE) { # Make sure we can link to uninstalled libraries !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { @@ -22,7 +22,7 @@ index 3567c8b..4eb4387 100644 unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" } if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -@@ -147,6 +147,7 @@ defineTest(qtAddModule) { +@@ -152,6 +152,7 @@ defineTest(qtAddModule) { export(INCLUDEPATH) export(QMAKE_FRAMEWORKPATH) export(QMAKE_LFLAGS) @@ -31,5 +31,5 @@ index 3567c8b..4eb4387 100644 } -- -1.7.3.1.msysgit.0 +1.7.3.2.343.g7d43d diff --git a/patches/0059-qtmultimedia-profiles.patch b/patches/0059-qtmultimedia-profiles.patch index 280f726..038ae32 100644 --- a/patches/0059-qtmultimedia-profiles.patch +++ b/patches/0059-qtmultimedia-profiles.patch @@ -1,4 +1,4 @@ -From f9b26bdbd3643c47848261587b593fca99461d9d Mon Sep 17 00:00:00 2001 +From f22fb1def08786e6712f2a036ea1d71bfec502d4 Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Mon, 24 Jan 2011 14:24:35 +0100 Subject: [PATCH] qtmultimedia profiles @@ -31,7 +31,7 @@ index 0000000..b060bf2 +QT.multimedia.depends = core gui +QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB diff --git a/qtmultimedia/src/multimedia/multimedia.pro b/qtmultimedia/src/multimedia/multimedia.pro -index 852322d..0d66533 100644 +index e827cdd..781a29a 100644 --- a/qtmultimedia/src/multimedia/multimedia.pro +++ b/qtmultimedia/src/multimedia/multimedia.pro @@ -1,3 +1,5 @@ @@ -42,7 +42,7 @@ index 852322d..0d66533 100644 QT = core gui @@ -6,7 +8,7 @@ DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE - unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui -include(../qbase.pri) +include($$QT_SOURCE_TREE/src/qbase.pri) diff --git a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch index 724d6a1..a8d6460 100644 --- a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch +++ b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch @@ -1,4 +1,4 @@ -From 0d1209bdba2fd87ead31b99a1dfd38f1c8bba8c9 Mon Sep 17 00:00:00 2001 +From 45332fdf9fb4971c26978057214af64ecb958cf4 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Tue, 25 Jan 2011 14:48:39 +0100 Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. @@ -8,10 +8,10 @@ Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index 38cd746..25141dd 100644 +index 312a0b2..96366de 100644 --- a/qtkernel/mkspecs/features/qt_functions.prf +++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -101,7 +101,7 @@ defineTest(qtAddModule) { +@@ -106,7 +106,7 @@ defineTest(qtAddModule) { unset(LINKAGE) mac { CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced @@ -20,7 +20,7 @@ index 38cd746..25141dd 100644 FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { INCLUDEPATH -= $$FRAMEWORK_INCLUDE -@@ -109,7 +109,7 @@ defineTest(qtAddModule) { +@@ -114,7 +114,7 @@ defineTest(qtAddModule) { } LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} } else:!qt_no_framework { #detection diff --git a/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch b/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch index 7ead389..69dbfdb 100644 --- a/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch +++ b/patches/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch @@ -1,4 +1,4 @@ -From 29adaa2a8155c7824c83214e3d37071a639c9549 Mon Sep 17 00:00:00 2001 +From f2f7ed0070e4bfdb9c870c349175a009d0c045f8 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Wed, 26 Jan 2011 09:44:09 +0100 Subject: [PATCH] Include headers.pri from the last path in MODULE_INCLUDES @@ -8,10 +8,10 @@ Subject: [PATCH] Include headers.pri from the last path in MODULE_INCLUDES 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index c6d873a..bfe111f 100644 +index 97f65e4..e428802 100644 --- a/qtkernel/src/qbase.pri +++ b/qtkernel/src/qbase.pri -@@ -17,7 +17,10 @@ mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm +@@ -16,7 +16,10 @@ isEmpty(QT_MAJOR_VERSION) { #load up the headers info CONFIG += qt_install_headers diff --git a/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch b/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch index 75d7bad..b24f84c 100644 --- a/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch +++ b/patches/0073-Avoid-recursively-including-the-same-arch.pri-file.patch @@ -1,4 +1,4 @@ -From 2aadd244d3b2bffb4c352a09c69841258aef9da0 Mon Sep 17 00:00:00 2001 +From 58e1896d80d909fcf3a4eb991c30025e75528c24 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Tue, 8 Feb 2011 11:36:13 +0100 Subject: [PATCH] Avoid recursively including the same arch.pri file @@ -8,10 +8,10 @@ Subject: [PATCH] Avoid recursively including the same arch.pri file 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/qtkernel/src/corelib/arch/arch.pri b/qtkernel/src/corelib/arch/arch.pri -index 57bc80a..68738d5 100644 +index cd23e5e..5ed5a25 100644 --- a/qtkernel/src/corelib/arch/arch.pri +++ b/qtkernel/src/corelib/arch/arch.pri -@@ -31,4 +31,6 @@ vxworks:HEADERS += arch/qatomic_vxworks.h +@@ -35,4 +35,6 @@ integrity:HEADERS += arch/qatomic_integrity.h QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH DEPENDPATH += $$QT_ARCH_CPP @@ -21,5 +21,5 @@ index 57bc80a..68738d5 100644 +} \ No newline at end of file -- -1.7.3.1 +1.7.1 diff --git a/patches/0075-Wrap-string-in-qPrintable-with-QString.patch b/patches/0075-Wrap-string-in-qPrintable-with-QString.patch index 4562fd3..f265868 100644 --- a/patches/0075-Wrap-string-in-qPrintable-with-QString.patch +++ b/patches/0075-Wrap-string-in-qPrintable-with-QString.patch @@ -1,4 +1,4 @@ -From 2dcc76025b25b3d92fc01d96b53b021fd342b010 Mon Sep 17 00:00:00 2001 +From e51fef59aceb4a097d4dc87fc16111be17b4e802 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 10 Feb 2011 11:59:01 -0600 Subject: [PATCH] Wrap string in qPrintable with QString @@ -11,10 +11,10 @@ usage. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qtkernel/src/corelib/global/qglobal.h b/qtkernel/src/corelib/global/qglobal.h -index c2fb16c..b794b51 100644 +index 1879537..8ea50be 100644 --- a/qtkernel/src/corelib/global/qglobal.h +++ b/qtkernel/src/corelib/global/qglobal.h -@@ -1610,7 +1610,7 @@ inline void qUnused(T &x) { (void)x; } +@@ -1680,7 +1680,7 @@ inline void qUnused(T &x) { (void)x; } #endif #ifndef qPrintable @@ -24,5 +24,5 @@ index c2fb16c..b794b51 100644 Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */ -- -1.7.3.2.343.g7d43d +1.7.1 diff --git a/patches/master/0001-Some-changes-for-qtkernel.patch b/patches/master/0001-Some-changes-for-qtkernel.patch deleted file mode 100644 index 26fff8c..0000000 --- a/patches/master/0001-Some-changes-for-qtkernel.patch +++ /dev/null @@ -1,345 +0,0 @@ -From 8aa39581665941c5ab7af138dc1e0e42ab63e97e Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Mon, 8 Nov 2010 20:09:10 -0600 -Subject: [PATCH] Some changes for qtkernel - ---- - qtkernel/bin/syncqt | 17 +----- - qtkernel/configure | 6 +- - qtkernel/qtkernel.pro | 32 +---------- - qtkernel/src/plugins/accessible/accessible.pro | 1 - - qtkernel/src/plugins/plugins.pro | 5 +- - qtkernel/src/src.pro | 75 +----------------------- - qtkernel/src/tools/tools.pro | 5 +- - qtkernel/tools/configure/configureapp.cpp | 2 +- - 8 files changed, 11 insertions(+), 132 deletions(-) - -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 32b5384..9d5eece 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -34,28 +34,13 @@ my %modules = ( # path to module name map - "QtOpenVG" => "$basedir/src/openvg", - "QtCore" => "$basedir/src/corelib", - "QtXml" => "$basedir/src/xml", -- "QtXmlPatterns" => "$basedir/src/xmlpatterns", - "QtSql" => "$basedir/src/sql", - "QtNetwork" => "$basedir/src/network", - "QtSvg" => "$basedir/src/svg", -- "QtDeclarative" => "$basedir/src/declarative", -- "QtScript" => "$basedir/src/script", -- "QtScriptTools" => "$basedir/src/scripttools", -- "Qt3Support" => "$basedir/src/qt3support", -- "ActiveQt" => "$basedir/src/activeqt", - "QtTest" => "$basedir/src/testlib", -- "QtHelp" => "$basedir/tools/assistant/lib", -- "QtDesigner" => "$basedir/tools/designer/src/lib", -- "QtUiTools" => "$basedir/tools/designer/src/uitools", - "QtDBus" => "$basedir/src/dbus", -- "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", -- "phonon" => "$basedir/src/phonon", -- "QtMultimedia" => "$basedir/src/multimedia", -- "QtMeeGoGraphicsSystemHelper" => "$basedir/tools/qmeegographicssystemhelper", - ); - my %moduleheaders = ( # restrict the module headers to those found in relative path -- "QtWebKit" => "../WebKit/qt/Api", -- "phonon" => "../3rdparty/phonon/phonon", - ); - - #$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; -@@ -692,7 +677,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); - my @ignore_for_include_check = ( "qatomic.h" ); - my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); - my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); --my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" ); -+my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDBus}" ); - my %colliding_headers = (); - my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir - -diff --git a/qtkernel/configure b/qtkernel/configure -index cddea86..c608b3c 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure -@@ -8718,11 +8718,11 @@ EXEC="" - - echo "Finding project files. Please wait..." - if [ "$CFG_NOPROCESS" != "yes" ]; then -- "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" -- if [ -f "${relpath}/projects.pro" ]; then -+ "$outpath/bin/qmake" -prl -r "${relpath}/qtkernel.pro" -+ if [ -f "${relpath}/qtkernel.pro" ]; then - mkfile="${outpath}/Makefile" - [ -f "$mkfile" ] && chmod +w "$mkfile" -- QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" -+ QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/qtkernel.pro" -o "$mkfile" - fi - fi - -diff --git a/qtkernel/qtkernel.pro b/qtkernel/qtkernel.pro -index 2e31e9a..05c745e 100644 ---- a/qtkernel/qtkernel.pro -+++ b/qtkernel/qtkernel.pro -@@ -7,30 +7,7 @@ TEMPLATE = subdirs - - cross_compile: CONFIG += nostrip - --isEmpty(QT_BUILD_PARTS) { #defaults -- symbian { -- QT_BUILD_PARTS = libs tools examples demos -- } else { -- QT_BUILD_PARTS = libs tools examples demos docs translations -- } --} else { #make sure the order makes sense -- contains(QT_BUILD_PARTS, translations) { -- QT_BUILD_PARTS -= translations -- QT_BUILD_PARTS = translations $$QT_BUILD_PARTS -- } -- contains(QT_BUILD_PARTS, tools) { -- QT_BUILD_PARTS -= tools -- QT_BUILD_PARTS = tools $$QT_BUILD_PARTS -- } -- contains(QT_BUILD_PARTS, libs) { -- QT_BUILD_PARTS -= libs -- QT_BUILD_PARTS = libs $$QT_BUILD_PARTS -- } -- contains(QT_BUILD_PARTS, qmake) { -- QT_BUILD_PARTS -= qmake -- QT_BUILD_PARTS = qmake $$QT_BUILD_PARTS -- } --} -+QT_BUILD_PARTS = libs qmake - - #process the projects - for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { -@@ -167,10 +144,3 @@ win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) { - mkspecs.files += $$QT_BUILD_TREE/mkspecs/default - } - INSTALLS += mkspecs -- --false:macx { #mac install location -- macdocs.files = $$htmldocs.files -- macdocs.path = /Developer/Documentation/Qt -- INSTALLS += macdocs --} -- -diff --git a/qtkernel/src/plugins/accessible/accessible.pro b/qtkernel/src/plugins/accessible/accessible.pro -index a7caf07..26c7d30 100644 ---- a/qtkernel/src/plugins/accessible/accessible.pro -+++ b/qtkernel/src/plugins/accessible/accessible.pro -@@ -2,5 +2,4 @@ TEMPLATE = subdirs - - contains(QT_CONFIG, accessibility) { - SUBDIRS += widgets -- contains(QT_CONFIG, qt3support):SUBDIRS += compat - } -diff --git a/qtkernel/src/plugins/plugins.pro b/qtkernel/src/plugins/plugins.pro -index 3e7da0e..d0d7188 100644 ---- a/qtkernel/src/plugins/plugins.pro -+++ b/qtkernel/src/plugins/plugins.pro -@@ -1,6 +1,6 @@ - TEMPLATE = subdirs - --SUBDIRS *= sqldrivers script bearer -+SUBDIRS *= sqldrivers bearer - unix:!symbian { - contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs - } else { -@@ -12,7 +12,4 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers - !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods - !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible - symbian:SUBDIRS += s60 --contains(QT_CONFIG, phonon): SUBDIRS *= phonon --contains(QT_CONFIG, multimedia): SUBDIRS *= audio - qpa:SUBDIRS += platforms --contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling -diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro -index 0908911..6da0877 100644 ---- a/qtkernel/src/src.pro -+++ b/qtkernel/src/src.pro -@@ -4,33 +4,19 @@ TEMPLATE = subdirs - unset(SRC_SUBDIRS) - win32:SRC_SUBDIRS += src_winmain - symbian:SRC_SUBDIRS += src_s60main --SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib -+SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml - nacl: SRC_SUBDIRS -= src_network src_testlib - !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus - !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui --!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support - - !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) --win32:SRC_SUBDIRS += src_activeqt - - contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl - contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg --contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns --contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon --contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia - contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg --contains(QT_CONFIG, script): SRC_SUBDIRS += src_script --contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative --contains(QT_CONFIG, webkit) { -- exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore -- SRC_SUBDIRS += src_webkit --} --!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools - SRC_SUBDIRS += src_plugins --contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports --contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative - --# s60installs need to be at the end, because projects.pro does an ordered build, -+# s60installs need to be at the end, because qtkernel.pro does an ordered build, - # and s60installs depends on all the others. - symbian:SRC_SUBDIRS += src_s60installs - -@@ -44,8 +30,6 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib - src_corelib.target = sub-corelib - src_xml.subdir = $$QT_SOURCE_TREE/src/xml - src_xml.target = sub-xml --src_xmlpatterns.subdir = $$QT_SOURCE_TREE/src/xmlpatterns --src_xmlpatterns.target = sub-xmlpatterns - src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus - src_dbus.target = sub-dbus - src_gui.subdir = $$QT_SOURCE_TREE/src/gui -@@ -56,36 +40,14 @@ src_network.subdir = $$QT_SOURCE_TREE/src/network - src_network.target = sub-network - src_svg.subdir = $$QT_SOURCE_TREE/src/svg - src_svg.target = sub-svg --src_script.subdir = $$QT_SOURCE_TREE/src/script --src_script.target = sub-script --src_scripttools.subdir = $$QT_SOURCE_TREE/src/scripttools --src_scripttools.target = sub-scripttools - src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl - src_opengl.target = sub-opengl - src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg - src_openvg.target = sub-openvg --src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support --src_qt3support.target = sub-qt3support --src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon --src_phonon.target = sub-phonon --src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia --src_multimedia.target = sub-multimedia --src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt --src_activeqt.target = sub-activeqt - src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins - src_plugins.target = sub-plugins --src_imports.subdir = $$QT_SOURCE_TREE/src/imports --src_imports.target = sub-imports - src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib - src_testlib.target = sub-testlib --src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore --src_javascriptcore.target = sub-javascriptcore --src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore --src_webkit.target = sub-webkit --src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative --src_declarative.target = sub-declarative --src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative --src_webkit_declarative.target = sub-webkitdeclarative - - #CONFIG += ordered - !wince*:!ordered:!symbian-abld:!symbian-sbsv2 { -@@ -93,57 +55,26 @@ src_webkit_declarative.target = sub-webkitdeclarative - src_gui.depends = src_corelib src_tools_uic - embedded: src_gui.depends += src_network - src_xml.depends = src_corelib -- src_xmlpatterns.depends = src_corelib src_network - src_dbus.depends = src_corelib src_xml - src_svg.depends = src_corelib src_gui -- src_script.depends = src_corelib -- src_scripttools.depends = src_script src_gui src_network - src_network.depends = src_corelib - src_opengl.depends = src_gui - src_openvg.depends = src_gui - src_sql.depends = src_corelib - src_testlib.depends = src_corelib -- src_qt3support.depends = src_gui src_xml src_network src_sql - src_tools_idc.depends = src_corelib # target defined in tools.pro - src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro -- src_phonon.depends = src_gui -- src_multimedia.depends = src_gui -- contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl -- src_activeqt.depends = src_tools_idc src_gui -- src_declarative.depends = src_gui src_script src_network -- src_plugins.depends = src_gui src_sql src_svg -- contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia -- contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative -+ src_plugins.depends = src_gui src_sql src_svg src_xml - src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS - src_s60installs.depends -= src_s60installs -- src_imports.depends = src_gui src_declarative -- contains(QT_CONFIG, webkit) { -- src_webkit.depends = src_gui src_sql src_network -- contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns -- src_imports.depends += src_webkit -- exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro) { -- src_webkit.depends += src_javascriptcore -- src_javascriptcore.depends = src_corelib -- } -- } -- contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support -- contains(QT_CONFIG, dbus):{ -- src_plugins.depends += src_dbus -- src_phonon.depends += src_dbus -- } - contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { - src_plugins.depends += src_opengl - src_declarative.depends += src_opengl - src_webkit.depends += src_opengl - } -- contains(QT_CONFIG, xmlpatterns) { -- src_declarative.depends += src_xmlpatterns -- src_webkit.depends += src_xmlpatterns -- } - contains(QT_CONFIG, svg) { - src_declarative.depends += src_svg - } -- contains(QT_CONFIG, webkit) : contains(QT_CONFIG, declarative): src_webkit_declarative.depends = src_declarative src_webkit - } - - -diff --git a/qtkernel/src/tools/tools.pro b/qtkernel/src/tools/tools.pro -index 4736d09..ca42da6 100644 ---- a/qtkernel/src/tools/tools.pro -+++ b/qtkernel/src/tools/tools.pro -@@ -3,7 +3,6 @@ TEMPLATE = subdirs - TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc - !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic - !cross_compile { -- contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 - win32:!wince*: SRC_SUBDIRS += src_tools_idc - } - -@@ -16,8 +15,6 @@ src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc - src_tools_rcc.target = sub-rcc - src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic - src_tools_uic.target = sub-uic --src_tools_uic3.subdir = $$QT_SOURCE_TREE/src/tools/uic3 --src_tools_uic3.target = sub-uic3 - src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc - src_tools_idc.target = sub-idc - -@@ -43,7 +40,7 @@ EXTRA_RELEASE_TARGETS = - subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP) - subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP) - SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE)) -- !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info { -+ !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc)):!separate_debug_info { - #debug - debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS - debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index 19cef9a..6cba094 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp -@@ -3828,7 +3828,7 @@ void Configure::generateMakefiles() - } - // don't pass -spec - .qmake.cache has it already - args << "-r"; -- args << (sourcePath + "/projects.pro"); -+ args << (sourcePath + "/qtkernel.pro"); - args << "-o"; - args << buildPath; - if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) --- -1.7.1 - diff --git a/patches/master/0002-qmake-profiles-for-qttools.patch b/patches/master/0002-qmake-profiles-for-qttools.patch deleted file mode 100644 index a27f34b..0000000 --- a/patches/master/0002-qmake-profiles-for-qttools.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e1f49d0a65ee60ec9360e5165c79c1ccf1c70e62 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <olivier.goffart@nokia.com> -Date: Fri, 12 Nov 2010 12:48:25 +0100 -Subject: [PATCH] qmake profiles for qttools - ---- - .../lib/fulltextsearch/fulltextsearch.pri | 2 +- - qttools/src/{tools.pro => src.pro} | 2 -- - 2 files changed, 1 insertions(+), 3 deletions(-) - rename qttools/src/{tools.pro => src.pro} (89%) - -diff --git a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri -index 134678f..aac2ec6 100644 ---- a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri -+++ b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri -@@ -1,7 +1,7 @@ - DEFINES += _BUILD_FOR_QT_ LUCENE_DISABLE_MEMTRACKING - win32:DEFINES += _CRT_SECURE_NO_DEPRECATE _MT - --CLUCENEDIR = ../../../../src/3rdparty/clucene/src/CLucene -+CLUCENEDIR = ../../../../3rdparty/clucene/src/CLucene - - INCLUDEPATH += . .. \ - $$CLUCENEDIR \ -diff --git a/qttools/src/tools.pro b/qttools/src/src.pro -similarity index 89% -rename from qttools/src/tools.pro -rename to qttools/src/src.pro -index e82bcaa..7b0b114 100644 ---- a/qttools/src/tools.pro -+++ b/qttools/src/src.pro -@@ -23,7 +23,6 @@ TEMPLATE = subdirs - unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt - } -- contains(QT_CONFIG, declarative):SUBDIRS += qml - } - - !wince*:!symbian:SUBDIRS += linguist -@@ -36,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap - - contains(QT_CONFIG, dbus):SUBDIRS += qdbus - # We don't need these command line utilities on embedded platforms. --!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator - embedded: SUBDIRS += makeqpf - - !wince*:!cross_compile:SUBDIRS += qdoc3 --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0003-Expose-source-and-build-directories-for-QtKernel.patch b/patches/master/0003-Expose-source-and-build-directories-for-QtKernel.patch deleted file mode 100644 index bb47a51..0000000 --- a/patches/master/0003-Expose-source-and-build-directories-for-QtKernel.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 069a613402f6381a26d65aac9d45a5cdcbd2fc02 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Thu, 11 Nov 2010 09:35:09 -0600 -Subject: [PATCH] Expose source and build directories for QtKernel - -Also expose moc, uic, rcc, qdbusxml2cpp, include and lib ---- - qtkernel/configure | 69 ++++++++++++------- - qtkernel/mkspecs/features/qt_module.prf | 16 +++++ - qtkernel/tools/configure/configureapp.cpp | 106 +++++++++++++++++------------ - 3 files changed, 121 insertions(+), 70 deletions(-) - create mode 100644 qtkernel/mkspecs/features/qt_module.prf - -diff --git a/qtkernel/configure b/qtkernel/configure -index c608b3c..51f3f03 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure -@@ -8213,10 +8213,10 @@ else - fi - done - fi -+ - #------------------------------------------------------------------------------- - # save configuration into qconfig.pri - #------------------------------------------------------------------------------- -- - QTCONFIG="$outpath/mkspecs/qconfig.pri" - QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" - [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -@@ -8301,23 +8301,19 @@ else - fi - - #------------------------------------------------------------------------------- --# save configuration into .qmake.cache -+# save configuration into qmodule.pri - #------------------------------------------------------------------------------- -+QTMODULE="$outpath/mkspecs/qmodule.pri" - --CACHEFILE="$outpath/.qmake.cache" --[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" --cat >>"$CACHEFILE.tmp" <<EOF --CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build -+cat >>"$QTMODULE.tmp" <<EOF -+#paths - QT_SOURCE_TREE = \$\$quote($relpath) - QT_BUILD_TREE = \$\$quote($outpath) - QT_BUILD_PARTS = $CFG_BUILD_PARTS --QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE --QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc - - #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR - QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc - QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic --QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 - QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc - QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp - QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include -@@ -8327,65 +8323,86 @@ EOF - - # Ensure we can link to uninistalled libraries - if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then -- echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$CACHEFILE.tmp" -+ echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_CFLAGS_PSQL" ]; then -- echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp" -+ echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_LFLAGS_PSQL" ]; then -- echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL" >> "$CACHEFILE.tmp" -+ echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_CFLAGS_MYSQL" ]; then -- echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL" >> "$CACHEFILE.tmp" -+ echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_LFLAGS_MYSQL" ]; then -- echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL" >> "$CACHEFILE.tmp" -+ echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_CFLAGS_SQLITE" ]; then -- echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE" >> "$CACHEFILE.tmp" -+ echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_LFLAGS_SQLITE" ]; then -- echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp" -+ echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_LFLAGS_ODBC" ]; then -- echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp" -+ echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$QTMODULE.tmp" - fi - if [ -n "$QT_LFLAGS_TDS" ]; then -- echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp" -+ echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$QTMODULE.tmp" - fi - - if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then -- echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp" -+ echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$QTMODULE.tmp" - fi - - #dump in the OPENSSL_LIBS info - if [ '!' -z "$OPENSSL_LIBS" ]; then -- echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp" -+ echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$QTMODULE.tmp" - elif [ "$CFG_OPENSSL" = "linked" ]; then -- echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp" -+ echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$QTMODULE.tmp" - fi - - #dump in the SDK info - if [ '!' -z "$CFG_SDK" ]; then -- echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$CACHEFILE.tmp" -+ echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$QTMODULE.tmp" - fi - - # mac gcc -Xarch support - if [ "$CFG_MAC_XARCH" = "no" ]; then -- echo "QMAKE_MAC_XARCH = no" >> "$CACHEFILE.tmp" -+ echo "QMAKE_MAC_XARCH = no" >> "$QTMODULE.tmp" - fi - - #dump the qmake spec - if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then -- echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp" -+ echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$QTMODULE.tmp" - else -- echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp" -+ echo "QMAKESPEC = $XPLATFORM" >> "$QTMODULE.tmp" - fi - - # cmdline args --cat "$QMAKE_VARS_FILE" >> "$CACHEFILE.tmp" -+cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp" - rm -f "$QMAKE_VARS_FILE" 2>/dev/null - -+# replace qmodule.pri if it differs from the newly created temp file -+if cmp -s "$QTMODULE.tmp" "$QTMODULE"; then -+ rm -f "$QTMODULE.tmp" -+else -+ mv -f "$QTMODULE.tmp" "$QTMODULE" -+fi -+ -+#------------------------------------------------------------------------------- -+# save configuration into .qmake.cache -+#------------------------------------------------------------------------------- -+ -+CACHEFILE="$outpath/.qmake.cache" -+[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" -+cat >>"$CACHEFILE.tmp" <<EOF -+include(\$\$PWD/mkspecs/qmodule.pri) -+CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build -+QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE -+QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc -+ -+EOF -+ - # incrementals - INCREMENTAL="" - [ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes" -diff --git a/qtkernel/mkspecs/features/qt_module.prf b/qtkernel/mkspecs/features/qt_module.prf -new file mode 100644 -index 0000000..3ec941a ---- /dev/null -+++ b/qtkernel/mkspecs/features/qt_module.prf -@@ -0,0 +1,16 @@ -+# This file is loaded on-demand, before any .qmake.cache (sometimes *in* .qmake.cache), to loaded -+# important settings for modules, such as paths to QtKernel and other modules. -+# Consequently, we have to do some stunts to figure out where to find qmodule.pri. -+ -+isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) { -+ exists($$_QMAKE_CACHE_/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/mkspecs/qmodule.pri -+ else:exists($$_QMAKE_CACHE_/qtkernel/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$_QMAKE_CACHE_/qtkernel/mkspecs/qmodule.pri -+ else:if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri -+ else:exists($$[QT_INSTALL_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_INSTALL_DATA]/mkspecs/qmodule.pri -+} -+ -+!exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) { -+ error("Cannot load qmodule.pri!") -+} else { -+ debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") -+} -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index 6cba094..bd2225f 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp -@@ -2888,63 +2888,101 @@ void Configure::generateCachefile() - QFile cacheFile(buildPath + "/.qmake.cache"); - if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. - QTextStream cacheStream(&cacheFile); -+ -+ cacheStream << "include($$PWD/mkspecs/qmodule.pri)" << endl; -+ - for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) { - cacheStream << (*var) << endl; - } - cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl; - -+ cacheStream.flush(); -+ cacheFile.close(); -+ } -+ -+ // Generate qmodule.pri -+ QFile configFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri"); -+ if (configFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. -+ QTextStream configStream(&configFile); -+ -+ configStream << "#paths" << endl; -+ configStream << "QT_BUILD_TREE = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl; -+ configStream << "QT_SOURCE_TREE = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl; - QStringList buildParts; - buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations"; - foreach (const QString &item, disabledBuildParts) { - buildParts.removeAll(item); - } -- cacheStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl; -+ configStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; -+ -+ //so that we can build without an install first (which would be impossible) -+ configStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl; -+ configStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl; -+ configStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl; -+ configStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl; -+ configStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl; -+ configStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; -+ configStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; -+ - - QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ]; - QString mkspec_path = fixSeparators(sourcePath + "/mkspecs/" + targetSpec); - if (QFile::exists(mkspec_path)) -- cacheStream << "QMAKESPEC = " << escapeSeparators(mkspec_path) << endl; -+ configStream << "QMAKESPEC = " << escapeSeparators(mkspec_path) << endl; - else -- cacheStream << "QMAKESPEC = " << fixSeparators(targetSpec, true) << endl; -- cacheStream << "ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; -- cacheStream << "QT_BUILD_TREE = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl; -- cacheStream << "QT_SOURCE_TREE = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl; -+ configStream << "QMAKESPEC = " << fixSeparators(targetSpec, true) << endl; -+ configStream << "ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; - - if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") -- cacheStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; -+ configStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; - -- //so that we can build without an install first (which would be impossible) -- cacheStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl; -- cacheStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl; -- cacheStream << "QMAKE_UIC3 = $$QT_BUILD_TREE" << fixSeparators("/bin/uic3.exe", true) << endl; -- cacheStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl; -- cacheStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl; -- cacheStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; -- cacheStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; - if (dictionary["CETEST"] == "yes") { -- cacheStream << "QT_CE_RAPI_INC = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl; -- cacheStream << "QT_CE_RAPI_LIB = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl; -+ configStream << "QT_CE_RAPI_INC = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl; -+ configStream << "QT_CE_RAPI_LIB = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl; -+ } -+ -+ configStream << "#Qt for Windows CE c-runtime deployment" << endl -+ << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ], true) << endl; -+ -+ if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) -+ configStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; -+ -+ if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) -+ configStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl; -+ -+ if (!dictionary["QT_LIBINFIX"].isEmpty()) -+ configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; -+ -+ configStream << "#Qt for Symbian FPU settings" << endl; -+ if (!dictionary["ARM_FPU_TYPE"].isEmpty()) { -+ configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; -+ } -+ if (!dictionary["QT_NAMESPACE"].isEmpty()) { -+ configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; - } - - // embedded - if (!dictionary["KBD_DRIVERS"].isEmpty()) -- cacheStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; -+ configStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; - if (!dictionary["GFX_DRIVERS"].isEmpty()) -- cacheStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; -+ configStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; - if (!dictionary["MOUSE_DRIVERS"].isEmpty()) -- cacheStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; -+ configStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; - if (!dictionary["DECORATIONS"].isEmpty()) -- cacheStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; -+ configStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; - - if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) -- cacheStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; -+ configStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; - -- cacheStream.flush(); -- cacheFile.close(); -+ configStream.flush(); -+ configFile.close(); - } -+ -+ // Generate qconfig.pri - QFile configFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qconfig.pri"); - if (configFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. - QTextStream configStream(&configFile); -+ - configStream << "CONFIG+= "; - configStream << dictionary[ "BUILD" ]; - if (dictionary[ "SHARED" ] == "yes") -@@ -3000,26 +3038,6 @@ void Configure::generateCachefile() - << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl - << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; - -- configStream << "#Qt for Windows CE c-runtime deployment" << endl -- << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ], true) << endl; -- -- if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) -- configStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; -- -- if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) -- configStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl; -- -- if (!dictionary["QT_LIBINFIX"].isEmpty()) -- configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; -- -- configStream << "#Qt for Symbian FPU settings" << endl; -- if (!dictionary["ARM_FPU_TYPE"].isEmpty()) { -- configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; -- } -- if (!dictionary["QT_NAMESPACE"].isEmpty()) { -- configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; -- } -- - configStream.flush(); - configFile.close(); - } --- -1.7.1 - diff --git a/patches/master/0004-Start-work-on-XmlPatterns.patch b/patches/master/0004-Start-work-on-XmlPatterns.patch deleted file mode 100644 index e1b84ed..0000000 --- a/patches/master/0004-Start-work-on-XmlPatterns.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 37e1e9428522a66f718adb7b07f7e88e12c56b56 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Fri, 12 Nov 2010 13:31:46 -0600 -Subject: [PATCH] Start work on XmlPatterns - ---- - qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -index d22f417..d7db65c 100644 ---- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -+++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = QtXmlPatterns - QPRO_PWD = $$PWD - QT = core \ -@@ -7,8 +9,8 @@ DEFINES += QT_BUILD_XMLPATTERNS_LIB \ - win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ - QtNetwork --include(../qbase.pri) --PRECOMPILED_HEADER = ../corelib/global/qt_pch.h -+include($$QT_SOURCE_TREE/src/qbase.pri) -+PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h - include($$PWD/common.pri) - include($$PWD/acceltree/acceltree.pri) - include($$PWD/api/api.pri) --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0005-Expose-private-support-for-separate-module-in-syncqt.patch b/patches/master/0005-Expose-private-support-for-separate-module-in-syncqt.patch deleted file mode 100644 index a4a5d31..0000000 --- a/patches/master/0005-Expose-private-support-for-separate-module-in-syncqt.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 64a4f149f254efd723afcc160e378b04d3110980 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Mon, 15 Nov 2010 16:43:22 +0100 -Subject: [PATCH] Expose private support for separate module in syncqt. - ---- - qtkernel/bin/syncqt | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 9d5eece..b8162d2 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -82,6 +82,7 @@ sub showUsage - print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; - print " -quiet Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n"; - print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; -+ print " -private Force copy private headers (default: " . ($create_private_headers ? "yes" : "no") . ")\n"; - print " -help This help\n"; - exit 0; - } -@@ -587,6 +588,9 @@ while ( @ARGV ) { - } elsif($arg eq "-quiet") { - $var = "quiet"; - $val = "yes"; -+ } elsif($arg eq "-private") { -+ $var = "create_private_headers"; -+ $val = "yes"; - } elsif($arg eq "-base-dir") { - # skip, it's been dealt with at the top of the file - shift @ARGV; -@@ -649,7 +653,6 @@ while ( @ARGV ) { - push @modules_to_sync, $module; - $moduleheaders{$module} = $headerdir; - $create_uic_class_map = 0; -- $create_private_headers = 0; - } elsif ($var eq "output") { - my $outdir = $val; - if(checkRelative($outdir)) { --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/master/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch deleted file mode 100644 index d0088d4..0000000 --- a/patches/master/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch +++ /dev/null @@ -1,334 +0,0 @@ -From 84111def10db648cc8a1dcb797dea17857139708 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Mon, 15 Nov 2010 13:55:17 -0600 -Subject: [PATCH] Make syncqt use sync.profile files from each module - -The sync.profile replaces the hardcoded paths inside syncqt, and -enables it to work for other modules than just qtkernel. ---- - qtkernel/bin/syncqt | 163 +++++++++++++++-------------- - qtkernel/configure | 3 +- - qtkernel/sync.profile | 44 ++++++++ - qtkernel/tools/configure/configureapp.cpp | 4 +- - 4 files changed, 130 insertions(+), 84 deletions(-) - create mode 100644 qtkernel/sync.profile - -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index b8162d2..7e5fc44 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -12,40 +12,22 @@ - use File::Basename; - use File::Path; - use Cwd; -+use Cwd 'abs_path'; - use Config; - use strict; - --for (my $i = 0; $i < $#ARGV; $i++) { -- if ($ARGV[$i] eq "-base-dir" && $i < $#ARGV - 1) { -- $ENV{"QTDIR"} = $ARGV[$i + 1]; -- last; -- } --} -+# set output basedir to be where ever syncqt is run from -+our $out_basedir = getcwd(); -+$out_basedir =~ s=\\=/=g; -+our $basedir; -+our $quoted_basedir; - --die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check - --# global variables --my $isunix = 0; --my $basedir = $ENV{"QTDIR"}; --$basedir =~ s=\\=/=g; --my %modules = ( # path to module name map -- "QtGui" => "$basedir/src/gui", -- "QtOpenGL" => "$basedir/src/opengl", -- "QtOpenVG" => "$basedir/src/openvg", -- "QtCore" => "$basedir/src/corelib", -- "QtXml" => "$basedir/src/xml", -- "QtSql" => "$basedir/src/sql", -- "QtNetwork" => "$basedir/src/network", -- "QtSvg" => "$basedir/src/svg", -- "QtTest" => "$basedir/src/testlib", -- "QtDBus" => "$basedir/src/dbus", --); --my %moduleheaders = ( # restrict the module headers to those found in relative path --); -- --#$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; -+# will be defined based on the modules sync.profile -+our (%modules, %moduleheaders, %classnames, %mastercontent); - - # global variables (modified by options) -+my $isunix = 0; - my $module = 0; - my $showonly = 0; - my $quiet = 0; -@@ -58,9 +40,7 @@ my $create_uic_class_map = 1; - my $create_private_headers = 1; - my @modules_to_sync ; - $force_relative = 1 if ( -d "/System/Library/Frameworks" ); --my $out_basedir = $basedir; --$out_basedir =~ s=\\=/=g; --my $quoted_basedir = "\Q$basedir"; -+ - - # functions ---------------------------------------------------------- - -@@ -74,6 +54,8 @@ my $quoted_basedir = "\Q$basedir"; - sub showUsage - { - print "$0 usage:\n"; -+ print " <module directory> Specifies which module to sync header files for (required for shadow builds!)\n\n"; -+ - print " -copy Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n"; - print " -remove-stale Removes stale headers (default: " . ($remove_stale ? "yes" : "no") . ")\n"; - print " -relative Force relative symlinks (default: " . ($force_relative ? "yes" : "no") . ")\n"; -@@ -155,37 +137,9 @@ sub shouldMasterInclude { - sub classNames { - my @ret; - my ($iheader) = @_; -- if(basename($iheader) eq "qglobal.h") { -- push @ret, "QtGlobal"; -- } elsif(basename($iheader) eq "qendian.h") { -- push @ret, "QtEndian"; -- } elsif(basename($iheader) eq "qconfig.h") { -- push @ret, "QtConfig"; -- } elsif(basename($iheader) eq "qplugin.h") { -- push @ret, "QtPlugin"; -- } elsif(basename($iheader) eq "qalgorithms.h") { -- push @ret, "QtAlgorithms"; -- } elsif(basename($iheader) eq "qcontainerfwd.h") { -- push @ret, "QtContainerFwd"; -- } elsif(basename($iheader) eq "qdebug.h") { -- push @ret, "QtDebug"; -- } elsif(basename($iheader) eq "qevent.h") { -- push @ret, "QtEvents"; -- } elsif(basename($iheader) eq "qnamespace.h") { -- push @ret, "Qt" -- } elsif(basename($iheader) eq "qssl.h") { -- push @ret, "QSsl"; -- } elsif(basename($iheader) eq "qtest.h") { -- push @ret, "QTest" -- } elsif(basename($iheader) eq "qtconcurrentmap.h") { -- push @ret, "QtConcurrentMap" -- } elsif(basename($iheader) eq "qtconcurrentfilter.h") { -- push @ret, "QtConcurrentFilter" -- } elsif(basename($iheader) eq "qtconcurrentrun.h") { -- push @ret, "QtConcurrentRun" -- } elsif(basename($iheader) eq "qaudio.h") { -- push @ret, "QAudio" -- } -+ -+ my $classname = $classnames{basename($iheader)}; -+ push @ret, $classname if ($classname); - - my $parsable = ""; - if(open(F, "<$iheader")) { -@@ -546,6 +500,52 @@ sub findFiles { - return @files; - } - -+###################################################################### -+# Syntax: loadSyncProfile() -+# -+# Purpose: Locates the sync.profile. -+# Returns: Hashmap of module name -> directory. -+###################################################################### -+sub loadSyncProfile { -+ my ($srcbase, $outbase) = @_; -+ print("srcbase = $$srcbase \n"); -+ print("outbase = $$outbase \n"); -+ -+ my $syncprofile = "$$srcbase/sync.profile"; -+ my $result; -+ unless ($result = do "$syncprofile") { -+ die "syncqt couldn't parse $syncprofile: $@" if $@; -+ die "syncqt couldn't execute $syncprofile: $!" unless defined $result; -+ } -+ return $result; -+} -+ -+sub locateSyncProfile -+{ -+ my ($directory) = @_; -+ my $syncprofile; -+ $directory = abs_path($directory); -+ while(!defined $syncprofile) { -+ local(*D); -+ if (opendir(D, $directory)) { -+ foreach my $file (sort readdir(D)) { -+ next if ($file =~ /^\.\.?$/); -+ $syncprofile = "$directory/$file" if ($file =~ /^sync\.profile$/); -+ last if (defined $syncprofile); -+ } -+ closedir(D); -+ } -+ last if (defined $syncprofile || $directory eq "/" || $directory =~ /^?:[\/\\]$/); -+ $directory = dirname($directory); -+ } -+ return $syncprofile; -+} -+ -+# check if this is an in-source build, and if so use that as the basedir too -+$basedir = locateSyncProfile($out_basedir); -+$basedir = dirname($basedir) if ($basedir); -+$quoted_basedir = "\Q$basedir"; -+ - # -------------------------------------------------------------------- - # "main" function - # -------------------------------------------------------------------- -@@ -595,6 +595,15 @@ while ( @ARGV ) { - # skip, it's been dealt with at the top of the file - shift @ARGV; - next; -+ } elsif($arg =~/^-/) { -+ print "Unknown option: $arg\n\n" if(!$var); -+ showUsage(); -+ } else { -+ $basedir = locateSyncProfile($arg); -+ die "Could not find a sync.profile for '$arg'\n" if (!$basedir); -+ $basedir = dirname($basedir); -+ $basedir =~ s=\\=/=g; -+ $var = "ignore"; - } - - #do something -@@ -666,6 +675,13 @@ while ( @ARGV ) { - $out_basedir =~ s=\\=/=g; - } - } -+ -+# if we have no $basedir we cannot be sure which sources you want, so die -+die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); -+ -+# load the module's sync.profile here, before we can -+loadSyncProfile(\$basedir, \$out_basedir); -+ - @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); - - $isunix = checkUnix; #cache checkUnix -@@ -676,11 +692,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; - - my @ignore_headers = (); - my $class_lib_map_contents = ""; --my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); --my @ignore_for_include_check = ( "qatomic.h" ); --my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); --my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); --my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDBus}" ); -+our @ignore_for_master_contents = (); -+our @ignore_for_include_check = (); -+our @ignore_for_qt_begin_header_check = (); -+our @ignore_for_qt_begin_namespace_check = (); -+our @ignore_for_qt_module_check = (); - my %colliding_headers = (); - my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir - -@@ -706,19 +722,8 @@ foreach my $lib (@modules_to_sync) { - chomp $line; - if($line =~ /^ *QT *\+?= *([^\r\n]*)/) { - foreach(split(/ /, $1)) { -- $master_contents .= "#include <QtCore/QtCore>\n" if($_ eq "core"); -- $master_contents .= "#include <QtGui/QtGui>\n" if($_ eq "gui"); -- $master_contents .= "#include <QtNetwork/QtNetwork>\n" if($_ eq "network"); -- $master_contents .= "#include <QtSvg/QtSvg>\n" if($_ eq "svg"); -- $master_contents .= "#include <QtDeclarative/QtDeclarative>\n" if($_ eq "declarative"); -- $master_contents .= "#include <QtScript/QtScript>\n" if($_ eq "script"); -- $master_contents .= "#include <QtScriptTools/QtScriptTools>\n" if($_ eq "scripttools"); -- $master_contents .= "#include <Qt3Support/Qt3Support>\n" if($_ eq "qt3support"); -- $master_contents .= "#include <QtSql/QtSql>\n" if($_ eq "sql"); -- $master_contents .= "#include <QtXml/QtXml>\n" if($_ eq "xml"); -- $master_contents .= "#include <QtXmlPatterns/QtXmlPatterns>\n" if($_ eq "xmlpatterns"); -- $master_contents .= "#include <QtOpenGL/QtOpenGL>\n" if($_ eq "opengl"); -- $master_contents .= "#include <QtOpenVG/QtOpenVG>\n" if($_ eq "openvg"); -+ my $content = $mastercontent{$_}; -+ $master_contents .= $content if ($content); - } - } - } -diff --git a/qtkernel/configure b/qtkernel/configure -index 51f3f03..d4bcb59 100755 ---- a/qtkernel/configure -+++ b/qtkernel/configure -@@ -2540,8 +2540,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then - if [ -x "$relpath/bin/syncqt" ]; then - mkdir -p "$outpath/bin" - echo "#!/bin/sh" >"$outpath/bin/syncqt" -- echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt" -- echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"\$@\"" >>"$outpath/bin/syncqt" -+ echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"$relpath\" \"\$@\"" >>"$outpath/bin/syncqt" - chmod 755 "$outpath/bin/syncqt" - fi - -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile -new file mode 100644 -index 0000000..7d2e4b1 ---- /dev/null -+++ b/qtkernel/sync.profile -@@ -0,0 +1,44 @@ -+%modules = ( # path to module name map -+ "QtGui" => "$basedir/src/gui", -+ "QtOpenGL" => "$basedir/src/opengl", -+ "QtOpenVG" => "$basedir/src/openvg", -+ "QtCore" => "$basedir/src/corelib", -+ "QtXml" => "$basedir/src/xml", -+ "QtSql" => "$basedir/src/sql", -+ "QtNetwork" => "$basedir/src/network", -+ "QtSvg" => "$basedir/src/svg", -+ "QtTest" => "$basedir/src/testlib", -+ "QtDBus" => "$basedir/src/dbus", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+ "qglobal.h" => "QtGlobal", -+ "qendian.h" => "QtEndian", -+ "qconfig.h" => "QtConfig", -+ "qplugin.h" => "QtPlugin", -+ "qalgorithms.h" => "QtAlgorithms", -+ "qcontainerfwd.h" => "QtContainerFwd", -+ "qdebug.h" => "QtDebug", -+ "qevent.h" => "QtEvents", -+ "qnamespace.h" => "Qt", -+ "qssl.h" => "QSsl", -+ "qtest.h" => "QTest", -+ "qtconcurrentmap.h" => "QtConcurrentMap", -+ "qtconcurrentfilter.h" => "QtConcurrentFilter", -+ "qtconcurrentrun.h" => "QtConcurrentRun", -+); -+%mastercontent = ( -+ "core" => "#include <QtCore/QtCore>\n", -+ "gui" => "#include <QtGui/QtGui>\n", -+ "network" => "#include <QtNetwork/QtNetwork>\n", -+ "svg" => "#include <QtSvg/QtSvg>\n", -+ "opengl" => "#include <QtOpenGL/QtOpenGL>\n", -+ "openvg" => "#include <QtOpenVG/QtOpenVG>\n", -+ "xml" => "#include <QtXml/QtXml>\n", -+); -+@ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); -+@ignore_for_include_check = ( "qatomic.h" ); -+@ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); -+@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" ); -+@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index bd2225f..a653aa7 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp -@@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv) - if (syncqt_bat.open(QFile::WriteOnly)) { - QTextStream stream(&syncqt_bat); - stream << "@echo off" << endl -- << "set QTDIR=" << QDir::toNativeSeparators(sourcePath) << endl -- << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/syncqt.bat -outdir \"") << fixSeparators(buildPath) << "\"" << endl -- << "set QTDIR=" << QDir::toNativeSeparators(buildPath) << endl; -+ << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/syncqt.bat -outdir \"") << fixSeparators(buildPath) << "\" \"" << fixSeparators(sourcePath) << "\"" << endl - syncqt_bat.close(); - } - } --- -1.7.1 - diff --git a/patches/master/0007-First-attempt-to-build-xmlpatterns.patch b/patches/master/0007-First-attempt-to-build-xmlpatterns.patch deleted file mode 100644 index 2454b7d..0000000 --- a/patches/master/0007-First-attempt-to-build-xmlpatterns.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 524428f40ec5bae3961dfe4f1f9b5b70236c6fdf Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Tue, 16 Nov 2010 14:34:35 +0100 -Subject: [PATCH] First attempt to build xmlpatterns. - ---- - qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro | 3 +++ - qtxmlpatterns/sync.profile | 11 +++++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - create mode 100644 qtxmlpatterns/sync.profile - -diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -index d7db65c..faeec54 100644 ---- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -+++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -@@ -11,6 +11,9 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ - QtNetwork - include($$QT_SOURCE_TREE/src/qbase.pri) - PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h -+INCLUDEPATH += $$OUT_PWD/../../include \ -+ $$OUT_PWD/../../include/QtXmlPatterns \ -+ $$OUT_PWD/../../include/QtXmlPatterns/private - include($$PWD/common.pri) - include($$PWD/acceltree/acceltree.pri) - include($$PWD/api/api.pri) -diff --git a/qtxmlpatterns/sync.profile b/qtxmlpatterns/sync.profile -new file mode 100644 -index 0000000..6707cea ---- /dev/null -+++ b/qtxmlpatterns/sync.profile -@@ -0,0 +1,11 @@ -+%modules = ( # path to module name map -+ "QtXmlPatterns" => "$basedir/src/xmlpatterns", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+); -+%mastercontent = ( -+ "core" => "#include <QtCore/QtCore>\n", -+ "network" => "#include <QtNetwork/QtNetwork>\n", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0009-First-attempt-to-build-script.patch b/patches/master/0009-First-attempt-to-build-script.patch deleted file mode 100644 index b862c8e..0000000 --- a/patches/master/0009-First-attempt-to-build-script.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 6004f320fc98d83e2c3de19b305b3d8604f4a665 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Fri, 19 Nov 2010 11:57:48 +0100 -Subject: [PATCH] First attempt to build script. - ---- - qtscript/src/script/script.pro | 21 +++++++++------------ - qtscript/sync.profile | 10 ++++++++++ - 2 files changed, 19 insertions(+), 12 deletions(-) - create mode 100644 qtscript/sync.profile - -diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro -index 34f4a88..6e1e598 100644 ---- a/qtscript/src/script/script.pro -+++ b/qtscript/src/script/script.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = QtScript - QPRO_PWD = $$PWD - QT = core -@@ -9,22 +11,13 @@ DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore - --include(../qbase.pri) -+include($$QT_SOURCE_TREE/src/qbase.pri) - - CONFIG += building-libs - --# FIXME: shared the statically built JavaScriptCore -- --# Fetch the base WebKit directory from the WEBKITDIR environment variable; --# fall back to src/3rdparty otherwise --WEBKITDIR = $$(WEBKITDIR) --isEmpty(WEBKITDIR) { -- WEBKITDIR = $$PWD/../3rdparty/javascriptcore -- GENERATED_SOURCES_DIR = generated --} else { -- message(using external WebKit from $$WEBKITDIR) -- CONFIG -= QTDIR_build --} -+WEBKITDIR = $$PWD/../3rdparty/javascriptcore -+GENERATED_SOURCES_DIR = generated -+ - include($$WEBKITDIR/WebKit.pri) - - # Disable a few warnings on Windows. -@@ -54,6 +47,10 @@ qpa:mac { - - include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) - -+INCLUDEPATH += $$OUT_PWD/../../include \ -+ $$OUT_PWD/../../include/QtScript \ -+ $$OUT_PWD/../../include/QtScript/private -+ - INCLUDEPATH += $$WEBKITDIR/JavaScriptCore - INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser - INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler -diff --git a/qtscript/sync.profile b/qtscript/sync.profile -new file mode 100644 -index 0000000..82a3a8f ---- /dev/null -+++ b/qtscript/sync.profile -@@ -0,0 +1,10 @@ -+%modules = ( # path to module name map -+ "QtScript" => "$basedir/src/script", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+); -+%mastercontent = ( -+ "core" => "#include <QtCore/QtCore>\n", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0010-First-attempt-to-build-scripttools.patch b/patches/master/0010-First-attempt-to-build-scripttools.patch deleted file mode 100644 index bcd5f19..0000000 --- a/patches/master/0010-First-attempt-to-build-scripttools.patch +++ /dev/null @@ -1,58 +0,0 @@ -From cc38b9720e504b0c46c26fe3fad81b76d1dbdf34 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Fri, 19 Nov 2010 13:58:03 +0100 -Subject: [PATCH] First attempt to build scripttools. - ---- - qtscript/src/scripttools/scripttools.pro | 11 +++++++++-- - qtscript/sync.profile | 3 +++ - 2 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/qtscript/src/scripttools/scripttools.pro b/qtscript/src/scripttools/scripttools.pro -index 061dea5..08a7b51 100644 ---- a/qtscript/src/scripttools/scripttools.pro -+++ b/qtscript/src/scripttools/scripttools.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = QtScriptTools - QPRO_PWD = $$PWD - QT = core gui script -@@ -7,9 +9,14 @@ DEFINES += QT_NO_USING_NAMESPACE - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript - --include(../qbase.pri) -- -+include($$QT_SOURCE_TREE/src/qbase.pri) - - include(debugging/debugging.pri) - -+INCLUDEPATH += $$OUT_PWD/../../include \ -+ $$OUT_PWD/../../include/QtScript \ -+ $$OUT_PWD/../../include/QtScript/private \ -+ $$OUT_PWD/../../include/QtScriptTools \ -+ $$OUT_PWD/../../include/QtScriptTools/private -+ - symbian:TARGET.UID3=0x2001E625 -diff --git a/qtscript/sync.profile b/qtscript/sync.profile -index 82a3a8f..d2f3c40 100644 ---- a/qtscript/sync.profile -+++ b/qtscript/sync.profile -@@ -1,5 +1,6 @@ - %modules = ( # path to module name map - "QtScript" => "$basedir/src/script", -+ "QtScriptTools" => "$basedir/src/scripttools", - ); - %moduleheaders = ( # restrict the module headers to those found in relative path - ); -@@ -7,4 +8,6 @@ - ); - %mastercontent = ( - "core" => "#include <QtCore/QtCore>\n", -+ "gui" => "#include <QtGui/QtGui>\n", -+ "scripttools" => "#include <QtScriptTools/QtScriptTools>\n", - ); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/master/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch deleted file mode 100644 index 6f19175..0000000 --- a/patches/master/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch +++ /dev/null @@ -1,429 +0,0 @@ -From 57a3cc555e65d07507375d9ffa0a796b38f8063a Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Wed, 24 Nov 2010 20:21:06 -0600 -Subject: [PATCH] Add module specific pris, and make syncqt create fwd includes - -The module specific pris define the modules - name - version - dependencies - include paths - lib paths - additional CONFIGs and DEFINES -They are located in the modules source directory, with fwd -includes created in QtKernel/mkspecs/modules build directory. -The pris use - QT_MODULE_INCLUDE_BASE - QT_MODULE_LIB_BASE -to specify the locations for includes and libs. These paths -are normally based on - QT_INSTALL_HEADERS - QT_INSTALL_LIBS -for installed modules, but overridden to the module's build -directory by syncqt for the fwd included pris. -The path of the pris must be specified in the sync.profile -for syncqt to create the fwding pris in QtKernel. ---- - qtkernel/bin/syncqt | 59 ++++++++++++++++++++++++++++-- - qtkernel/mkspecs/features/qt_config.prf | 9 ++++- - qtkernel/src/modules/qt_core.pri | 11 ++++++ - qtkernel/src/modules/qt_dbus.pri | 12 ++++++ - qtkernel/src/modules/qt_gui.pri | 11 ++++++ - qtkernel/src/modules/qt_network.pri | 11 ++++++ - qtkernel/src/modules/qt_opengl.pri | 12 ++++++ - qtkernel/src/modules/qt_openvg.pri | 12 ++++++ - qtkernel/src/modules/qt_sql.pri | 11 ++++++ - qtkernel/src/modules/qt_svg.pri | 11 ++++++ - qtkernel/src/modules/qt_testlib.pri | 12 ++++++ - qtkernel/src/modules/qt_xml.pri | 11 ++++++ - qtkernel/sync.profile | 13 +++++++ - qtxmlpatterns/modules/qt_xmlpatterns.pri | 11 ++++++ - qtxmlpatterns/sync.profile | 3 ++ - 15 files changed, 205 insertions(+), 4 deletions(-) - create mode 100644 qtkernel/src/modules/qt_core.pri - create mode 100644 qtkernel/src/modules/qt_dbus.pri - create mode 100644 qtkernel/src/modules/qt_gui.pri - create mode 100644 qtkernel/src/modules/qt_network.pri - create mode 100644 qtkernel/src/modules/qt_opengl.pri - create mode 100644 qtkernel/src/modules/qt_openvg.pri - create mode 100644 qtkernel/src/modules/qt_sql.pri - create mode 100644 qtkernel/src/modules/qt_svg.pri - create mode 100644 qtkernel/src/modules/qt_testlib.pri - create mode 100644 qtkernel/src/modules/qt_xml.pri - create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri - -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 7e5fc44..bceab27 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -23,8 +23,16 @@ our $basedir; - our $quoted_basedir; - - -+# try to figure out where QtKernel is located -+# normally the script location should be enough, if not fall back to -+# QTDIR environment variable. If that doesn't work, later ask the -+# user to use the -qtdir option explicitly. -+my $qtkerneldir = dirname(dirname($0)); -+$qtkerneldir = $ENV{"QTDIR"} if ($qtkerneldir !~ /qtkernel/); -+$qtkerneldir =~ s=\\=/=g if (defined $qtkerneldir); -+ - # will be defined based on the modules sync.profile --our (%modules, %moduleheaders, %classnames, %mastercontent); -+our (%modules, %moduleheaders, %classnames, %mastercontent, %modulepris); - - # global variables (modified by options) - my $isunix = 0; -@@ -38,6 +46,7 @@ my $check_includes = 0; - my $copy_headers = 0; - my $create_uic_class_map = 1; - my $create_private_headers = 1; -+my $no_module_fwd = 0; - my @modules_to_sync ; - $force_relative = 1 if ( -d "/System/Library/Frameworks" ); - -@@ -62,9 +71,12 @@ sub showUsage - print " -windows Force platform to Windows (default: " . ($force_win ? "yes" : "no") . ")\n"; - print " -showonly Show action but not perform (default: " . ($showonly ? "yes" : "no") . ")\n"; - print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; -+ print " -qtdir <PATH> Set the path to QtKernel (detected: " . (defined $qtkerneldir ? $qtkerneldir : "-none-") . ")\n"; - print " -quiet Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n"; -- print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; -+ print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR>\n"; -+ print " Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; - print " -private Force copy private headers (default: " . ($create_private_headers ? "yes" : "no") . ")\n"; -+ print " -no-module-fwd Don't create fwd includes for module pri files\n"; - print " -help This help\n"; - exit 0; - } -@@ -556,7 +568,7 @@ while ( @ARGV ) { - - #parse - my $arg = shift @ARGV; -- if ($arg eq "-h" || $arg eq "-help" || $arg eq "?") { -+ if ($arg eq "-h" || $arg eq "-help" || $arg eq "-?" || $arg eq "?") { - $var = "show_help"; - $val = "yes"; - } elsif($arg eq "-copy") { -@@ -591,10 +603,16 @@ while ( @ARGV ) { - } elsif($arg eq "-private") { - $var = "create_private_headers"; - $val = "yes"; -+ } elsif($arg eq "-qtdir") { -+ $var = "qtdir"; -+ $val = shift @ARGV; - } elsif($arg eq "-base-dir") { - # skip, it's been dealt with at the top of the file - shift @ARGV; - next; -+ } elsif($arg eq "-no-module-fwd") { -+ $var = "no_module_fwd"; -+ $val = "yes"; - } elsif($arg =~/^-/) { - print "Unknown option: $arg\n\n" if(!$var); - showUsage(); -@@ -662,6 +680,15 @@ while ( @ARGV ) { - push @modules_to_sync, $module; - $moduleheaders{$module} = $headerdir; - $create_uic_class_map = 0; -+ } elsif ($var eq "qtdir") { -+ if($val) { -+ $qtkerneldir = $val; -+ $qtkerneldir =~ s=\\=/=g; -+ } else { -+ die "The -qtdir option requires an argument"; -+ } -+ } elsif ($var eq "no_module_fwd") { -+ $no_module_fwd = 1; - } elsif ($var eq "output") { - my $outdir = $val; - if(checkRelative($outdir)) { -@@ -676,6 +703,15 @@ while ( @ARGV ) { - } - } - -+# if the $qtkerneldir neither has 'qtkernel' somewhere in its path, nor a -+# '.qmake.cache' file in its directory, we assume it's not a valid path -+# (remember that a yet-to-be-built qtkernel doesn't have this file either, -+# thus the 'qtkernel' path check!) -+die "Cannot automatically detect/use provided path to QtKernel's build directory!\n" . -+ "QTDIR detected/provided: " . (defined $qtkerneldir ? $qtkerneldir : "-none-") . "\n" . -+ "Please -qtdir option to provide the correct path.\nsyncqt failed" -+ if (!defined $qtkerneldir || (!-e "$qtkerneldir/.qmake.cache" && $qtkerneldir !~ /qtkernel/)); -+ - # if we have no $basedir we cannot be sure which sources you want, so die - die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); - -@@ -960,6 +996,23 @@ foreach my $lib (@modules_to_sync) { - print HEADERS_PRI_FILE $headers_pri_contents; - close HEADERS_PRI_FILE; - } -+ -+ # create forwarding module pri in qtkernel/mkspecs/modules -+ unless ($no_module_fwd) { -+ my $modulepri = $modulepris{$lib}; -+ if (-e $modulepri) { -+ my $modulepriname = basename($modulepri); -+ my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname"; -+ open MODULE_PRI_FILE, ">$moduleprifwd"; -+ print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; -+ print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; -+ print MODULE_PRI_FILE "include($modulepri)\n"; -+ close MODULE_PRI_FILE; -+ utime(time, (stat($modulepri))[9], $moduleprifwd); -+ } elsif ($modulepri) { -+ print "WARNING: Module $lib\'s pri file '$modulepri' not found.\nSkipped creating forwarding pri for $lib.\n"; -+ } -+ } - } - } - unless($showonly || !$create_uic_class_map) { -diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf -index de1cac4..2973c7e 100644 ---- a/qtkernel/mkspecs/features/qt_config.prf -+++ b/qtkernel/mkspecs/features/qt_config.prf -@@ -14,7 +14,14 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \ - $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) { - debug(1, "Loading modules from $${dir}") -- for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod) -+ for(mod, $$list($$files($$dir/modules/qt_*.pri))) { -+ # For installed Qt these paths will be common for all modules -+ # For development these will vary per module, and syncqt will override the value in the -+ # qt_<module>.pri forwarding file -+ QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] -+ QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] -+ include($$mod) -+ } - } - } - -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri -new file mode 100644 -index 0000000..742aefe ---- /dev/null -+++ b/qtkernel/src/modules/qt_core.pri -@@ -0,0 +1,11 @@ -+QT_CORE_VERSION = $$QT_VERSION -+QT_CORE_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_CORE_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.core.name = QtCore -+QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore -+QT.core.libs = $$QT_MODULE_LIB_BASE -+QT.core.depends = -+ -+QT_CONFIG += core -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri -new file mode 100644 -index 0000000..fddcbf7 ---- /dev/null -+++ b/qtkernel/src/modules/qt_dbus.pri -@@ -0,0 +1,12 @@ -+QT_DBUS_VERSION = $$QT_VERSION -+QT_DBUS_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_DBUS_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.dbus.name = QtDBus -+QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus -+QT.dbus.libs = $$QT_MODULE_LIB_BASE -+QT.dbus.depends = core xml -+QT.dbus.CONFIG = dbusadaptors dbusinterfaces -+ -+QT_CONFIG += dbus -diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri -new file mode 100644 -index 0000000..6da7431 ---- /dev/null -+++ b/qtkernel/src/modules/qt_gui.pri -@@ -0,0 +1,11 @@ -+QT_GUI_VERSION = $$QT_VERSION -+QT_GUI_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_GUI_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.gui.name = QtGui -+QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui -+QT.gui.libs = $$QT_MODULE_LIB_BASE -+QT.gui.depends = core network -+ -+QT_CONFIG += gui -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri -new file mode 100644 -index 0000000..4d32079 ---- /dev/null -+++ b/qtkernel/src/modules/qt_network.pri -@@ -0,0 +1,11 @@ -+QT_CORE_VERSION = $$QT_VERSION -+QT_NETWORK_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_NETWORK_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.network.name = QtNetwork -+QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork -+QT.network.libs = $$QT_MODULE_LIB_BASE -+QT.network.depends = core -+ -+QT_CONFIG += network -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri -new file mode 100644 -index 0000000..9ad1425 ---- /dev/null -+++ b/qtkernel/src/modules/qt_opengl.pri -@@ -0,0 +1,12 @@ -+QT_OPENGL_VERSION = $$QT_VERSION -+QT_OPENGL_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_OPENGL_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.opengl.name = QtOpenGL -+QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL -+QT.opengl.libs = $$QT_MODULE_LIB_BASE -+QT.opengl.depends = core gui -+QT.opengl.CONFIG = opengl -+ -+QT_CONFIG += opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri -new file mode 100644 -index 0000000..612bd13 ---- /dev/null -+++ b/qtkernel/src/modules/qt_openvg.pri -@@ -0,0 +1,12 @@ -+QT_OPENVG_VERSION = $$QT_VERSION -+QT_OPENVG_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_OPENVG_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.openvg.name = QtOpenVG -+QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG -+QT.openvg.libs = $$QT_MODULE_LIB_BASE -+QT.openvg.depends = core gui -+QT.openvg.CONFIG = openvg -+ -+QT_CONFIG += openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri -new file mode 100644 -index 0000000..bf5917b ---- /dev/null -+++ b/qtkernel/src/modules/qt_sql.pri -@@ -0,0 +1,11 @@ -+QT_SQL_VERSION = $$QT_VERSION -+QT_SQL_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_SQL_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.sql.name = QtSql -+QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql -+QT.sql.libs = $$QT_MODULE_LIB_BASE -+QT.sql.depends = core -+ -+QT_CONFIG += sql -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri -new file mode 100644 -index 0000000..faccb78 ---- /dev/null -+++ b/qtkernel/src/modules/qt_svg.pri -@@ -0,0 +1,11 @@ -+QT_SVG_VERSION = $$QT_VERSION -+QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.svg.name = QtSvg -+QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg -+QT.svg.libs = $$QT_MODULE_LIB_BASE -+QT.svg.depends = core gui -+ -+QT_CONFIG += svg -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri -new file mode 100644 -index 0000000..0f65438 ---- /dev/null -+++ b/qtkernel/src/modules/qt_testlib.pri -@@ -0,0 +1,12 @@ -+QT_TEST_VERSION = $$QT_VERSION -+QT_TEST_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_TEST_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.testlib.name = QtTest -+QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest -+QT.testlib.libs = $$QT_MODULE_LIB_BASE -+QT.testlib.depends = core -+QT.testlib.CONFIG = console -+ -+QT_CONFIG += testlib -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri -new file mode 100644 -index 0000000..45dbc667 ---- /dev/null -+++ b/qtkernel/src/modules/qt_xml.pri -@@ -0,0 +1,11 @@ -+QT_XML_VERSION = $$QT_VERSION -+QT_XML_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_XML_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.xml.name = QtXml -+QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml -+QT.xml.libs = $$QT_MODULE_LIB_BASE -+QT.xml.depends = core -+ -+QT_CONFIG += xml -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile -index 7d2e4b1..c8ef4fc 100644 ---- a/qtkernel/sync.profile -+++ b/qtkernel/sync.profile -@@ -37,6 +37,19 @@ - "openvg" => "#include <QtOpenVG/QtOpenVG>\n", - "xml" => "#include <QtXml/QtXml>\n", - ); -+%modulepris = ( -+ "QtCore" => "$basedir/src/modules/qt_core.pri", -+ "QtDBus" => "$basedir/src/modules/qt_dbus.pri", -+ "QtGui" => "$basedir/src/modules/qt_gui.pri", -+ "QtNetwork" => "$basedir/src/modules/qt_network.pri", -+ "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri", -+ "QtOpenVG" => "$basedir/src/modules/qt_openvg.pri", -+ "QtSql" => "$basedir/src/modules/qt_sql.pri", -+ "QtSvg" => "$basedir/src/modules/qt_svg.pri", -+ "QtTest" => "$basedir/src/modules/qt_testlib.pri", -+ "QtXml" => "$basedir/src/modules/qt_xml.pri", -+); -+ - @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); - @ignore_for_include_check = ( "qatomic.h" ); - @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); -diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri -new file mode 100644 -index 0000000..2237142 ---- /dev/null -+++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri -@@ -0,0 +1,11 @@ -+QT_XMLPATTERNS_VERSION = $$QT_VERSION -+QT_XMLPATTERNS_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_XMLPATTERNS_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_XMLPATTERNS_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.xmlpatterns.name = QtXmlPatterns -+QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns -+QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE -+QT.xmlpatterns.depends = core network -+ -+QT_CONFIG += xmlpatterns -diff --git a/qtxmlpatterns/sync.profile b/qtxmlpatterns/sync.profile -index 6707cea..9548e0f 100644 ---- a/qtxmlpatterns/sync.profile -+++ b/qtxmlpatterns/sync.profile -@@ -9,3 +9,6 @@ - "core" => "#include <QtCore/QtCore>\n", - "network" => "#include <QtNetwork/QtNetwork>\n", - ); -+%modulepris = ( -+ "QtXmlPatterns" => "$basedir/modules/qt_xmlpatterns.pri", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch b/patches/master/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch deleted file mode 100644 index 7341595..0000000 --- a/patches/master/0014-Add-resolve_depends-var-prefix-function-to-qmake.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 0a0937aa7ed1c3c5887ea8a5952474e1d6446d90 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Wed, 24 Nov 2010 11:51:57 -0600 -Subject: [PATCH] Add resolve_depends(var, prefix) function to qmake - -This function calculates the topological order of variables. -We will use it to determine which and in what order to link -module libraries. - -The function is not tied to libraries/modules only, but requires -the variables to be ordered to have their dependencies in the -[prefix]<var>.depends subvariable. - -Due to the recursive nature of the algorithm it was just much easier -to implement it directly in C++ rather than in a qmake-language -function. ---- - qtkernel/qmake/project.cpp | 46 +++++++++++++++++++++++++++++++++++++++++++- - qtkernel/qmake/project.h | 1 + - 2 files changed, 46 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/qmake/project.cpp b/qtkernel/qmake/project.cpp -index 7cc1cb6..5e2306d 100644 ---- a/qtkernel/qmake/project.cpp -+++ b/qtkernel/qmake/project.cpp -@@ -81,7 +81,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST - E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION, - E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND, - E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE, -- E_SIZE, E_GENERATE_UID }; -+ E_SIZE, E_GENERATE_UID, E_RESOLVE_DEPENDS }; - QMap<QString, ExpandFunc> qmake_expandFunctions() - { - static QMap<QString, ExpandFunc> *qmake_expand_functions = 0; -@@ -114,6 +114,7 @@ QMap<QString, ExpandFunc> qmake_expandFunctions() - qmake_expand_functions->insert("replace", E_REPLACE); - qmake_expand_functions->insert("size", E_SIZE); - qmake_expand_functions->insert("generate_uid", E_GENERATE_UID); -+ qmake_expand_functions->insert("resolve_depends", E_RESOLVE_DEPENDS); - } - return *qmake_expand_functions; - } -@@ -1801,6 +1802,39 @@ QMakeProject::doProjectExpand(QString func, QStringList args, - // defined in symbian generator - extern QString generate_test_uid(const QString& target); - -+ -+void calculateDeps(QStringList &sortedList, const QString &item, const QString &prefix, -+ QStringList &org, QMap<QString, QStringList> &place) -+{ -+ if (sortedList.contains(item)) -+ return; -+ -+ foreach(QString dep, place.value(prefix + item + ".depends")) { -+ calculateDeps(sortedList, dep, prefix, org, place); -+ if (org.isEmpty()) -+ break; -+ } -+ -+ if (org.contains(item)) { -+ sortedList += item; -+ org.removeAll(item); -+ } -+} -+ -+QStringList -+QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix, -+ QMap<QString, QStringList> &place) -+{ -+ QStringList sortedList; -+ QStringList org = deps; -+ foreach(QString item, deps) { -+ calculateDeps(sortedList, item, prefix, org, place); -+ if (org.isEmpty()) -+ break; -+ } -+ return sortedList; -+} -+ - QStringList - QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, - QMap<QString, QStringList> &place) -@@ -2247,6 +2281,16 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, - ret += generate_test_uid(args.first()); - } - break; -+ case E_RESOLVE_DEPENDS: { -+ if(args.count() < 1 || args.count() > 2) { -+ fprintf(stderr, "%s:%d: resolve_depends(var, prefix) requires one or two arguments.\n", -+ parser.file.toLatin1().constData(), parser.line_no); -+ } else { -+ ret += resolveDepends(args[0].split(QString(Option::field_sep)), -+ (args.count() != 2 ? QString() : args[1]), -+ place); -+ } -+ break; } - default: { - fprintf(stderr, "%s:%d: Unknown replace function: %s\n", - parser.file.toLatin1().constData(), parser.line_no, -diff --git a/qtkernel/qmake/project.h b/qtkernel/qmake/project.h -index 09aa45e..66e48cd 100644 ---- a/qtkernel/qmake/project.h -+++ b/qtkernel/qmake/project.h -@@ -107,6 +107,7 @@ class QMakeProject - QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0); - void init(QMakeProperty *, const QMap<QString, QStringList> *); - QStringList &values(const QString &v, QMap<QString, QStringList> &place); -+ QStringList resolveDepends(const QStringList &deps, const QString &prefix, QMap<QString, QStringList> &place); - void validateModes(); - - public: --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch b/patches/master/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch deleted file mode 100644 index 4719720..0000000 --- a/patches/master/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 44f9c53a3de443994189f98aa940f7e8aa255153 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Wed, 24 Nov 2010 22:20:01 -0600 -Subject: [PATCH] Make qt.prf use new qt_module.pri structure for QT variable - -This change requires the new resolve_depends(var, prefix) function in qmake. ---- - qtkernel/mkspecs/features/qt.prf | 87 +++++---------------------- - qtkernel/mkspecs/features/qt_functions.prf | 63 ++++++++++++++++++++ - qtkernel/src/qbase.pri | 4 +- - 3 files changed, 82 insertions(+), 72 deletions(-) - -diff --git a/qtkernel/mkspecs/features/qt.prf b/qtkernel/mkspecs/features/qt.prf -index 191a449..4d8e465 100644 ---- a/qtkernel/mkspecs/features/qt.prf -+++ b/qtkernel/mkspecs/features/qt.prf -@@ -35,19 +35,6 @@ plugin { #Qt plugins - INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes - win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt - --# As order does matter for static libs, we reorder the QT variable here --TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core meegographicssystemhelper --for(QTLIB, $$list($$TMPLIBS)) { -- contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB --} -- --QT_UNKNOWN = $$QT --QT_UNKNOWN -= $$QT_ORDERED --QT = $$QT_ORDERED --for(QTLIB, $$list($$QT_UNKNOWN)) { -- !contains(TMPLIBS, $$QTLIB):message("Warning: unknown QT: $$QTLIB") --} -- - QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN - for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { - for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) { -@@ -128,69 +115,27 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { - } - } - } -+ -+ -+ - #specific module settings - !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs - QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT -+ -+# Topological ordering of modules based on their QT.<module>.depends variable -+QT = $$resolve_depends($$QT, "QT.") -+ - for(QTLIB, $$list($$lower($$unique(QT)))) { -- unset(qlib_style) -- !qt_debug:!qt_release { -- CONFIG(debug, debug|release):qlib_style = debug -- else:qlib_style = release -- } else:CONFIG(qt_debug, qt_debug|qt_release) { -- qlib_style = debug -- } else { -- qlib_style = release -- } -+ isEmpty(QT.$${QTLIB}.name) { -+ message("Warning: unknown QT module: $$QTLIB") -+ next() -+ } - -- unset(qlib) -- isEqual(QTLIB, gui):qlib = QtGui -- else:isEqual(QTLIB, network):qlib = QtNetwork -- else:isEqual(QTLIB, xml):qlib = QtXml -- else:isEqual(QTLIB, xmlpatterns):qlib = QtXmlPatterns -- else:isEqual(QTLIB, opengl):qlib = QtOpenGL -- else:isEqual(QTLIB, openvg):qlib = QtOpenVG -- else:isEqual(QTLIB, sql):qlib = QtSql -- else:isEqual(QTLIB, core):qlib = QtCore -- else:isEqual(QTLIB, canvas):qlib = QtCanvas -- else:isEqual(QTLIB, qt3support):qlib = Qt3Support -- else:isEqual(QTLIB, svg):qlib = QtSvg -- else:isEqual(QTLIB, script):qlib = QtScript -- else:isEqual(QTLIB, scripttools):qlib = QtScriptTools -- else:isEqual(QTLIB, testlib):qlib = QtTest -- else:isEqual(QTLIB, dbus):qlib = QtDBus -- else:isEqual(QTLIB, phonon) { -- qlib = phonon -- INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat -- -- # The Helix backend requires this. Since we can't let a plugin set it, -- # we bump the values for all Symbian Phonon plugins. -- symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000 -- -- } else:isEqual(QTLIB, webkit) { -- qlib = QtWebKit -- aix-xlc { -- # Flags recommended by IBM when using WebKit -- QMAKE_LFLAGS -= -bmaxdata:0x80000000 -- QMAKE_LFLAGS += -bmaxdata:0xD0000000/dsa -- } -- } else:isEqual(QTLIB, declarative):qlib = QtDeclarative -- else:isEqual(QTLIB, multimedia):qlib = QtMultimedia -- else:isEqual(QTLIB, meegographicssystemhelper):qlib = QtMeeGoGraphicsSystemHelper -- else:message("Unknown QT: $$QTLIB"):qlib = -- !isEmpty(qlib) { -- target_qt:isEqual(TARGET, qlib) { -- warning($$TARGET cannot have a QT of $$QTLIB) -- } else { -- DEFINES *= $$upper(QT_$${QTLIB}_LIB) -- isEqual(QTLIB, opengl):CONFIG += opengl -- isEqual(QTLIB, openvg):CONFIG += openvg -- isEqual(QTLIB, qt3support):DEFINES *= QT3_SUPPORT -- isEqual(QTLIB, testlib):CONFIG += console -- isEqual(QTLIB, dbus):CONFIG += dbusadaptors dbusinterfaces -- -- qtAddLibrary($$qlib) -- } -- } -+ target_qt:isEqual(TARGET, QTLIB) { -+ warning($$TARGET cannot have a QT of $$QTLIB) -+ next() -+ } -+ qtAddModule($$QTLIB) - } - - qt_compat { -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index 1fb6298..9182f87 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -92,6 +92,69 @@ defineTest(qtAddLibrary) { - return(true) - } - -+defineTest(qtAddModule) { -+ MODULE_NAME = $$eval(QT.$${1}.name) -+ MODULE_INCLUDES = $$eval(QT.$${1}.includes) -+ MODULE_LIBS = $$eval(QT.$${1}.libs) -+ -+ CONFIG += $$eval(QT.$${1}.CONFIG) -+ DEFINES += $$eval(QT.$${1}.DEFINES) -+ -+ INCLUDEPATH -= $$MODULE_INCLUDES -+ INCLUDEPATH = $$MODULE_INCLUDES $$INCLUDEPATH -+ -+ unset(LINKAGE) -+ mac { -+ CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced -+ QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT} -+ FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers -+ !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { -+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE -+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH -+ } -+ LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} -+ } else:!qt_no_framework { #detection -+ for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { -+ exists($${frmwrk_dir}/$${MODULE_NAME}.framework) { -+ QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} -+ FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers -+ !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { -+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE -+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH -+ } -+ LINKAGE = -framework $${MODULE_NAME} -+ break() -+ } -+ } -+ } -+ } -+ isEmpty(LINKAGE) { -+ # Make sure we can link to uninstalled libraries -+ !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { -+ QMAKE_LFLAGS *= -L$$MODULE_LIBS -+ unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" -+ } -+ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -+ win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d -+ mac:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}_debug -+ } -+ isEmpty(LINKAGE):LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX} -+ } -+ !isEmpty(QMAKE_LSB) { -+ QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT -+ QMAKE_LFLAGS *= -L/opt/lsb/lib -+ QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX} -+ } -+ LIBS += $$LINKAGE -+ export(CONFIG) -+ export(DEFINES) -+ export(LIBS) -+ export(INCLUDEPATH) -+ export(QMAKE_FRAMEWORKPATH) -+ export(QMAKE_LFLAGS) -+ return(true) -+} -+ - # variable, default - defineTest(qtPrepareTool) { - isEmpty($$1) { -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index 4d835bd..08f4758 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri -@@ -1,5 +1,7 @@ - isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") --INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat -+ -+MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) -+INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat - !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR - isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 - TEMPLATE = lib --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0016-Make-modules-compile-without-hardcoded-paths.patch b/patches/master/0016-Make-modules-compile-without-hardcoded-paths.patch deleted file mode 100644 index 5196d66..0000000 --- a/patches/master/0016-Make-modules-compile-without-hardcoded-paths.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c575551eb611001643cc6dce796a4a6e58ee84dd Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Wed, 24 Nov 2010 13:21:56 -0600 -Subject: [PATCH] Make modules compile without hardcoded paths - ---- - qtkernel/src/corelib/corelib.pro | 1 + - qtkernel/src/qbase.pri | 5 ++++- - qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro | 3 --- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/qtkernel/src/corelib/corelib.pro b/qtkernel/src/corelib/corelib.pro -index e946d5d..96f047c 100644 ---- a/qtkernel/src/corelib/corelib.pro -+++ b/qtkernel/src/corelib/corelib.pro -@@ -1,3 +1,4 @@ -+MODULE = core - TARGET = QtCore - QPRO_PWD = $$PWD - QT = -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index 08f4758..1742b0a 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri -@@ -1,3 +1,6 @@ -+load(qt_module) -+ -+isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) - isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") - - MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) -@@ -13,7 +16,7 @@ isEmpty(QT_MAJOR_VERSION) { - - #load up the headers info - CONFIG += qt_install_headers --HEADERS_PRI = $$QT_BUILD_TREE/include/$$TARGET/headers.pri -+HEADERS_PRI = $$MODULE_INCLUDES/headers.pri - include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) - - #version overriding -diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -index faeec54..d7db65c 100644 ---- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -+++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro -@@ -11,9 +11,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ - QtNetwork - include($$QT_SOURCE_TREE/src/qbase.pri) - PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h --INCLUDEPATH += $$OUT_PWD/../../include \ -- $$OUT_PWD/../../include/QtXmlPatterns \ -- $$OUT_PWD/../../include/QtXmlPatterns/private - include($$PWD/common.pri) - include($$PWD/acceltree/acceltree.pri) - include($$PWD/api/api.pri) --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0018-Update-qtscript-by-following-the-new-method.patch b/patches/master/0018-Update-qtscript-by-following-the-new-method.patch deleted file mode 100644 index 7122ed0..0000000 --- a/patches/master/0018-Update-qtscript-by-following-the-new-method.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 7dd08edfb3d97293aafc8cd45d7efb85da0762cc Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Thu, 25 Nov 2010 14:43:30 +0100 -Subject: [PATCH] Update qtscript by following the new method. - ---- - qtscript/modules/qt_script.pri | 9 +++++++++ - qtscript/modules/qt_scripttools.pri | 9 +++++++++ - qtscript/src/script/script.pro | 4 ---- - qtscript/src/scripttools/scripttools.pro | 6 ------ - qtscript/sync.profile | 4 ++++ - 5 files changed, 22 insertions(+), 10 deletions(-) - create mode 100644 qtscript/modules/qt_script.pri - create mode 100644 qtscript/modules/qt_scripttools.pri - -diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri -new file mode 100644 -index 0000000..cf04bf9 ---- /dev/null -+++ b/qtscript/modules/qt_script.pri -@@ -0,0 +1,9 @@ -+QT_SCRIPT_VERSION = $$QT_VERSION -+QT_SCRIPT_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_SCRIPT_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.script.name = QtScript -+QT.script.includes = $$QT_MODULE_INCLUDE_BASE/QtScript -+QT.script.libs = $$QT_MODULE_LIB_BASE -+QT.script.depends = core -diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri -new file mode 100644 -index 0000000..2ed4324 ---- /dev/null -+++ b/qtscript/modules/qt_scripttools.pri -@@ -0,0 +1,9 @@ -+QT_SCRIPTTOOLS_VERSION = $$QT_VERSION -+QT_SCRIPTTOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_SCRIPTTOOLS_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.scripttools.name = QtScriptTools -+QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools -+QT.scripttools.libs = $$QT_MODULE_LIB_BASE -+QT.scripttools.depends = script gui network -diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro -index 6e1e598..3d01850 100644 ---- a/qtscript/src/script/script.pro -+++ b/qtscript/src/script/script.pro -@@ -47,10 +47,6 @@ qpa:mac { - - include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) - --INCLUDEPATH += $$OUT_PWD/../../include \ -- $$OUT_PWD/../../include/QtScript \ -- $$OUT_PWD/../../include/QtScript/private -- - INCLUDEPATH += $$WEBKITDIR/JavaScriptCore - INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser - INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler -diff --git a/qtscript/src/scripttools/scripttools.pro b/qtscript/src/scripttools/scripttools.pro -index 08a7b51..a42eb6a 100644 ---- a/qtscript/src/scripttools/scripttools.pro -+++ b/qtscript/src/scripttools/scripttools.pro -@@ -13,10 +13,4 @@ include($$QT_SOURCE_TREE/src/qbase.pri) - - include(debugging/debugging.pri) - --INCLUDEPATH += $$OUT_PWD/../../include \ -- $$OUT_PWD/../../include/QtScript \ -- $$OUT_PWD/../../include/QtScript/private \ -- $$OUT_PWD/../../include/QtScriptTools \ -- $$OUT_PWD/../../include/QtScriptTools/private -- - symbian:TARGET.UID3=0x2001E625 -diff --git a/qtscript/sync.profile b/qtscript/sync.profile -index d2f3c40..beedec7 100644 ---- a/qtscript/sync.profile -+++ b/qtscript/sync.profile -@@ -11,3 +11,7 @@ - "gui" => "#include <QtGui/QtGui>\n", - "scripttools" => "#include <QtScriptTools/QtScriptTools>\n", - ); -+%modulepris = ( -+ "QtScript" => "$basedir/modules/qt_script.pri", -+ "QtScriptTools" => "$basedir/modules/qt_scripttools.pri", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0019-Make-declarative-compile.patch b/patches/master/0019-Make-declarative-compile.patch deleted file mode 100644 index 604f41e..0000000 --- a/patches/master/0019-Make-declarative-compile.patch +++ /dev/null @@ -1,104 +0,0 @@ -From b3830c1df598ce7edd3e0e9420b9d8cae03c3632 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Thu, 25 Nov 2010 15:20:01 +0100 -Subject: [PATCH] Make declarative compile. - ---- - qtquick/modules/qt_declarative.pri | 9 +++++++++ - qtquick/src/declarative/declarative.pro | 6 ++++-- - qtquick/sync.profile | 15 +++++++++++++++ - qtscript/modules/qt_script.pri | 2 +- - qtscript/modules/qt_scripttools.pri | 2 +- - 5 files changed, 30 insertions(+), 4 deletions(-) - create mode 100644 qtquick/modules/qt_declarative.pri - create mode 100644 qtquick/sync.profile - -diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri -new file mode 100644 -index 0000000..5fb8c25 ---- /dev/null -+++ b/qtquick/modules/qt_declarative.pri -@@ -0,0 +1,9 @@ -+QT_DECLARATIVE_VERSION = $$QT_VERSION -+QT_DECLARATIVE_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.declarative.name = QtDeclarative -+QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative -+QT.declarative.libs = $$QT_MODULE_LIB_BASE -+QT.declarative.depends = gui script network -diff --git a/qtquick/src/declarative/declarative.pro b/qtquick/src/declarative/declarative.pro -index 6bd314f..680e0f9 100644 ---- a/qtquick/src/declarative/declarative.pro -+++ b/qtquick/src/declarative/declarative.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = QtDeclarative - QPRO_PWD = $$PWD - QT = core gui script network -@@ -13,7 +15,7 @@ exists("qdeclarative_enable_gcov") { - LIBS += -lgcov - } - --include(../qbase.pri) -+include($$QT_SOURCE_TREE/src/qbase.pri) - - #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET - #DESTDIR=. -@@ -37,5 +39,5 @@ symbian: { - } - - DEFINES += QT_NO_OPENTYPE --INCLUDEPATH += ../3rdparty/harfbuzz/src -+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - -diff --git a/qtquick/sync.profile b/qtquick/sync.profile -new file mode 100644 -index 0000000..77da8d8 ---- /dev/null -+++ b/qtquick/sync.profile -@@ -0,0 +1,15 @@ -+%modules = ( # path to module name map -+ "QtDeclarative" => "$basedir/src/declarative", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+); -+%mastercontent = ( -+ "gui" => "#include <QtGui/QtGui>\n", -+ "script" => "#include <QtScript/QtScript>\n", -+ "network" => "#include <QtNetwork/QtNetwork>\n", -+); -+%modulepris = ( -+ "QtDeclarative" => "$basedir/modules/qt_declarative.pri", -+); -diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri -index cf04bf9..d0dcd2d 100644 ---- a/qtscript/modules/qt_script.pri -+++ b/qtscript/modules/qt_script.pri -@@ -4,6 +4,6 @@ QT_SCRIPT_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.script.name = QtScript --QT.script.includes = $$QT_MODULE_INCLUDE_BASE/QtScript -+QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript - QT.script.libs = $$QT_MODULE_LIB_BASE - QT.script.depends = core -diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri -index 2ed4324..a39e22a 100644 ---- a/qtscript/modules/qt_scripttools.pri -+++ b/qtscript/modules/qt_scripttools.pri -@@ -4,6 +4,6 @@ QT_SCRIPTTOOLS_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.scripttools.name = QtScriptTools --QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools -+QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScriptTools - QT.scripttools.libs = $$QT_MODULE_LIB_BASE - QT.scripttools.depends = script gui network --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0025-Make-tools-compile.patch b/patches/master/0025-Make-tools-compile.patch deleted file mode 100644 index aa8c16e..0000000 --- a/patches/master/0025-Make-tools-compile.patch +++ /dev/null @@ -1,356 +0,0 @@ -From 401dc79ff99a6648eb1a0f3bb6421883c085f12d Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Tue, 11 Jan 2011 08:40:22 +0100 -Subject: [PATCH] Make tools compile. - ---- - qttools/modules/qt_designer.pri | 10 ++++++++++ - qttools/modules/qt_uitools.pri | 10 ++++++++++ - .../src/assistant/tools/assistant/assistant.pro | 6 +++--- - .../qcollectiongenerator/qcollectiongenerator.pro | 3 ++- - .../tools/qhelpconverter/qhelpconverter.pro | 2 +- - .../tools/qhelpgenerator/qhelpgenerator.pro | 2 +- - qttools/src/designer/src/components/lib/lib.pro | 11 ++++++----- - qttools/src/designer/src/designer/designer.pro | 3 ++- - qttools/src/designer/src/lib/lib.pro | 9 ++++++--- - qttools/src/designer/src/lib/shared/shared.pri | 2 +- - qttools/src/linguist/linguist/linguist.pro | 5 ++++- - qttools/src/linguist/lrelease/lrelease.pro | 6 ++++-- - qttools/src/linguist/lupdate/lupdate.pro | 6 ++++-- - qttools/src/qtconfig/qtconfig.pro | 2 ++ - qttools/src/qttracereplay/qttracereplay.pro | 4 +++- - qttools/src/src.pro | 3 +-- - qttools/sync.profile | 13 +++++++++++++ - 17 files changed, 73 insertions(+), 24 deletions(-) - create mode 100644 qttools/modules/qt_designer.pri - create mode 100644 qttools/modules/qt_uitools.pri - -diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri -new file mode 100644 -index 0000000..8d7c513 ---- /dev/null -+++ b/qttools/modules/qt_designer.pri -@@ -0,0 +1,10 @@ -+QT_DESIGNER_VERSION = $$QT_VERSION -+QT_DESIGNER_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_DESIGNER_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_DESIGNER_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.designer.name = QtDesigner -+QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesigner -+QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib -+QT.designer.libs = $$QT_MODULE_LIB_BASE -+QT.designer.depends = xml -diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri -new file mode 100644 -index 0000000..516afef ---- /dev/null -+++ b/qttools/modules/qt_uitools.pri -@@ -0,0 +1,10 @@ -+QT_UITOOLS_VERSION = $$QT_VERSION -+QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.uitools.name = QtUiTools -+QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools -+QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools -+QT.uitools.libs = $$QT_MODULE_LIB_BASE -+QT.uitools.depends = xml -diff --git a/qttools/src/assistant/tools/assistant/assistant.pro b/qttools/src/assistant/tools/assistant/assistant.pro -index 7f0fdd1..dd79c10 100644 ---- a/qttools/src/assistant/tools/assistant/assistant.pro -+++ b/qttools/src/assistant/tools/assistant/assistant.pro -@@ -1,3 +1,4 @@ -+DEFINES += QT_NO_WEBKIT - include(../../../shared/fontpanel/fontpanel.pri) - TEMPLATE = app - LANGUAGE = C++ -@@ -6,14 +7,13 @@ contains(QT_CONFIG, webkit):QT += webkit - CONFIG += qt \ - warn_on \ - help --QT += network -+QT += network help - PROJECTNAME = Assistant - DESTDIR = ../../../../bin - target.path = $$[QT_INSTALL_BINS] - INSTALLS += target - DEPENDPATH += ../shared --DEPENDPATH += . --INCLUDEPATH += . -+INCLUDEPATH += $$QT.help.includes - - # ## Work around a qmake issue when statically linking to - # ## not-yet-installed plugins -diff --git a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro -index 98e6a31..66e920f 100644 ---- a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro -+++ b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro -@@ -1,5 +1,6 @@ - QT += xml \ -- network -+ network \ -+ help - TEMPLATE = app - DESTDIR = ../../../../bin - TARGET = qcollectiongenerator -diff --git a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro -index 341faf3..ce3083e 100644 ---- a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro -+++ b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro -@@ -1,4 +1,4 @@ --QT += xml -+QT += xml help - TEMPLATE = app - TARGET = qhelpconverter - DESTDIR = ../../../../bin -diff --git a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro -index 68efcf5..82bec1d 100644 ---- a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro -+++ b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro -@@ -3,7 +3,7 @@ TARGET = qhelpgenerator - DESTDIR = ../../../../bin - CONFIG += qt warn_on help console - CONFIG -= app_bundle --QT += network -+QT += network help - - target.path=$$[QT_INSTALL_BINS] - INSTALLS += target -diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro -index 50a8b00..165315e 100644 ---- a/qttools/src/designer/src/components/lib/lib.pro -+++ b/qttools/src/designer/src/components/lib/lib.pro -@@ -1,12 +1,13 @@ -+load(qt_module) -+ - TEMPLATE = lib - TARGET = QtDesignerComponents - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - CONFIG += qt depend_prl no_objective_c designer - win32|mac: CONFIG += debug_and_release --QTDIR_build { -- DESTDIR = $$QT_BUILD_TREE/lib -- !wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin --} -+DESTDIR = $$QT_BUILD_TREE/lib -+!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin -+QT += designer - - # QtDesignerComponents uses - DEFINES += QT_STATICPLUGIN -@@ -17,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) { - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} - } - --include(../../../../../src/qt_targets.pri) -+include($$QT_SOURCE_TREE/src/qt_targets.pri) - QMAKE_TARGET_PRODUCT = Designer - QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. - -diff --git a/qttools/src/designer/src/designer/designer.pro b/qttools/src/designer/src/designer/designer.pro -index 8564e96..42cd345 100644 ---- a/qttools/src/designer/src/designer/designer.pro -+++ b/qttools/src/designer/src/designer/designer.pro -@@ -1,6 +1,7 @@ -+load(qt_module) - - DESTDIR = ../../../../bin --QT += xml network -+QT += xml network designer - contains(QT_CONFIG, script): QT += script - build_all:!build_pass { - CONFIG -= build_all -diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro -index 3ba6f52..4e0e2b2 100644 ---- a/qttools/src/designer/src/lib/lib.pro -+++ b/qttools/src/designer/src/lib/lib.pro -@@ -1,11 +1,14 @@ -+load(qt_module) -+ - TEMPLATE=lib - TARGET=QtDesigner - QT += xml - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - CONFIG += qt - win32|mac: CONFIG += debug_and_release --DESTDIR = ../../../../lib --!wince*:DLLDESTDIR = ../../../../bin -+DESTDIR = $$QT_BUILD_TREE/lib -+!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin -+INCLUDEPATH += $$QT.designer.includes - - isEmpty(QT_MAJOR_VERSION) { - VERSION=4.3.0 -@@ -15,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) { - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml - --include(../../../../src/qt_targets.pri) -+include($$QT_SOURCE_TREE/src/qt_targets.pri) - QMAKE_TARGET_PRODUCT = Designer - QMAKE_TARGET_DESCRIPTION = Graphical user interface designer. - -diff --git a/qttools/src/designer/src/lib/shared/shared.pri b/qttools/src/designer/src/lib/shared/shared.pri -index 8286360..589a357 100644 ---- a/qttools/src/designer/src/lib/shared/shared.pri -+++ b/qttools/src/designer/src/lib/shared/shared.pri -@@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script - - include(../../../../shared/qtpropertybrowser/qtpropertybrowser.pri) - include(../../../../shared/deviceskin/deviceskin.pri) --include(../../../../../src/tools/rcc/rcc.pri) -+include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri) - include(../../../../shared/findwidget/findwidget.pri) - include(../../../../shared/qtgradienteditor/qtgradienteditor.pri) - -diff --git a/qttools/src/linguist/linguist/linguist.pro b/qttools/src/linguist/linguist/linguist.pro -index ce8d585..ce78d13 100644 ---- a/qttools/src/linguist/linguist/linguist.pro -+++ b/qttools/src/linguist/linguist/linguist.pro -@@ -1,8 +1,10 @@ -+load(qt_modules) -+ - TEMPLATE = app - LANGUAGE = C++ - DESTDIR = ../../../bin - --QT += xml -+QT += xml uitools designer - - CONFIG += qt \ - warn_on \ -@@ -17,6 +19,7 @@ build_all:!build_pass { - include(../shared/formats.pri) - - DEFINES += QFORMINTERNAL_NAMESPACE -+ - INCLUDEPATH += ../../designer/src/uitools - INCLUDEPATH += ../../designer/src/lib/uilib - -diff --git a/qttools/src/linguist/lrelease/lrelease.pro b/qttools/src/linguist/lrelease/lrelease.pro -index 89694be..8489431 100644 ---- a/qttools/src/linguist/lrelease/lrelease.pro -+++ b/qttools/src/linguist/lrelease/lrelease.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TEMPLATE = app - TARGET = lrelease - DESTDIR = ../../../bin -@@ -12,10 +14,10 @@ SOURCES += \ - win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp - macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp - --include(../../../src/tools/bootstrap/bootstrap.pri) -+include($$QT_SOURCE_TREE/src/tools/bootstrap/bootstrap.pri) - include(../shared/formats.pri) - include(../shared/proparser.pri) --include(../../shared/symbian/epocroot.pri) -+include($$QT_SOURCE_TREE/tools/shared/symbian/epocroot.pri) - - win32:LIBS += -ladvapi32 # for qsettings_win.cpp - -diff --git a/qttools/src/linguist/lupdate/lupdate.pro b/qttools/src/linguist/lupdate/lupdate.pro -index 3ed909a..5f1996e 100644 ---- a/qttools/src/linguist/lupdate/lupdate.pro -+++ b/qttools/src/linguist/lupdate/lupdate.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TEMPLATE = app - TARGET = lupdate - DESTDIR = ../../../bin -@@ -15,8 +17,8 @@ build_all:!build_pass { - include(../shared/formats.pri) - include(../shared/proparser.pri) - --include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri) --INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml $$QT_BUILD_TREE/include/QtDeclarative -+include($$QT.declarative.sources/qml/parser/parser.pri) -+INCLUDEPATH += $$QT.declarative.sources/qml $$QT.declarative.includes - - SOURCES += \ - main.cpp \ -diff --git a/qttools/src/qtconfig/qtconfig.pro b/qttools/src/qtconfig/qtconfig.pro -index d1fd320..06d8ca5 100644 ---- a/qttools/src/qtconfig/qtconfig.pro -+++ b/qttools/src/qtconfig/qtconfig.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TEMPLATE = app - CONFIG += qt warn_on x11 - build_all:!build_pass { -diff --git a/qttools/src/qttracereplay/qttracereplay.pro b/qttools/src/qttracereplay/qttracereplay.pro -index cc5b98d..691a66b 100644 ---- a/qttools/src/qttracereplay/qttracereplay.pro -+++ b/qttools/src/qttracereplay/qttracereplay.pro -@@ -1,9 +1,11 @@ -+load(qt_module) -+ - TEMPLATE = app - - DESTDIR = ../../bin - - DEPENDPATH += . --INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src -+INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - TARGET = qttracereplay - - # Input -diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index 7b0b114..6491236 100644 ---- a/qttools/src/src.pro -+++ b/qttools/src/src.pro -@@ -11,7 +11,6 @@ TEMPLATE = subdirs - } else { - SUBDIRS = assistant \ - pixeltool \ -- porting \ - qtestlib \ - qttracereplay - contains(QT_EDITION, Console) { -@@ -20,7 +19,7 @@ TEMPLATE = subdirs - SUBDIRS += designer - } - } -- unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig -+# unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt - } - } -diff --git a/qttools/sync.profile b/qttools/sync.profile -index c6aaf0e..443b891 100644 ---- a/qttools/sync.profile -+++ b/qttools/sync.profile -@@ -1,12 +1,25 @@ - %modules = ( # path to module name map - "QtHelp" => "$basedir/src/assistant/lib", -+ "QtDesigner" => "$basedir/src/designer/src/lib", -+ "QtUiTools" => "$basedir/src/designer/src/uitools", - ); - %moduleheaders = ( # restrict the module headers to those found in relative path - ); - %classnames = ( - ); - %mastercontent = ( -+ "sql" => "#include <QtSql/QtSql>\n", -+ "xml" => "#include <QtXml/QtXml>\n", -+ "network" => "#include <QtNetwork/QtNetwork>\n", -+ "script" => "#include <QtScript/QtScript>\n", -+ "qt3support" => "#include <Qt3Support/Qt3Support>\n", -+ "declarative" => "#include <QtDeclarative/QtDeclarative>\n", -+ "help" => "#include <QtHelp/QtHelp>\n", -+ "designer" => "#include <QtDesigner/QtDesigner>\n", -+ "uitools" => "#include <QtUiTools/QtUiTools>\n", - ); - %modulepris = ( - "QtHelp" => "$basedir/modules/qt_help.pri", -+ "QtDesigner" => "$basedir/modules/qt_designer.pri", -+ "QtUiTools" => "$basedir/modules/qt_uitools.pri", - ); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0027-Move-QtSvg-into-a-separate-repository.patch b/patches/master/0027-Move-QtSvg-into-a-separate-repository.patch deleted file mode 100644 index 5ff987b..0000000 --- a/patches/master/0027-Move-QtSvg-into-a-separate-repository.patch +++ /dev/null @@ -1,231 +0,0 @@ -From aeffc8a9c04de49386e3476fd4d41d5c9416fdd6 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Mon, 27 Dec 2010 14:49:29 +0100 -Subject: [PATCH] Move QtSvg into a separate repository - ---- - qtkernel/src/plugins/imageformats/imageformats.pro | 1 - - qtkernel/src/plugins/plugins.pro | 2 +- - qtkernel/src/src.pro | 9 +-------- - qtkernel/sync.profile | 3 --- - {qtkernel/src => qtsvg}/modules/qt_svg.pri | 2 +- - .../iconengines/svgiconengine/svgiconengine.pro | 6 ++++-- - qtsvg/src/plugins/imageformats/svg/svg.pro | 6 ++++-- - qtsvg/src/svg/svg.pro | 9 +++++---- - qtsvg/sync.profile | 14 ++++++++++++++ - 9 files changed, 30 insertions(+), 22 deletions(-) - rename {qtkernel/src => qtsvg}/modules/qt_svg.pri (82%) - create mode 100644 qtsvg/sync.profile - -diff --git a/qtkernel/src/plugins/imageformats/imageformats.pro b/qtkernel/src/plugins/imageformats/imageformats.pro -index 5fff2de..66dea09 100644 ---- a/qtkernel/src/plugins/imageformats/imageformats.pro -+++ b/qtkernel/src/plugins/imageformats/imageformats.pro -@@ -3,6 +3,5 @@ TEMPLATE = subdirs - !contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg - !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif - !contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng --contains(QT_CONFIG, svg):SUBDIRS += svg - !contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff - !contains(QT_CONFIG, no-ico):SUBDIRS += ico -diff --git a/qtkernel/src/plugins/plugins.pro b/qtkernel/src/plugins/plugins.pro -index d0d7188..c1aff35 100644 ---- a/qtkernel/src/plugins/plugins.pro -+++ b/qtkernel/src/plugins/plugins.pro -@@ -6,7 +6,7 @@ unix:!symbian { - } else { - SUBDIRS *= codecs - } --!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines -+!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats - !embedded:!qpa:SUBDIRS *= graphicssystems - embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers - !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods -diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro -index 6da0877..2f65a08 100644 ---- a/qtkernel/src/src.pro -+++ b/qtkernel/src/src.pro -@@ -13,7 +13,6 @@ nacl: SRC_SUBDIRS -= src_network src_testlib - - contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl - contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg --contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg - SRC_SUBDIRS += src_plugins - - # s60installs need to be at the end, because qtkernel.pro does an ordered build, -@@ -38,8 +37,6 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql - src_sql.target = sub-sql - src_network.subdir = $$QT_SOURCE_TREE/src/network - src_network.target = sub-network --src_svg.subdir = $$QT_SOURCE_TREE/src/svg --src_svg.target = sub-svg - src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl - src_opengl.target = sub-opengl - src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg -@@ -56,7 +53,6 @@ src_testlib.target = sub-testlib - embedded: src_gui.depends += src_network - src_xml.depends = src_corelib - src_dbus.depends = src_corelib src_xml -- src_svg.depends = src_corelib src_gui - src_network.depends = src_corelib - src_opengl.depends = src_gui - src_openvg.depends = src_gui -@@ -64,7 +60,7 @@ src_testlib.target = sub-testlib - src_testlib.depends = src_corelib - src_tools_idc.depends = src_corelib # target defined in tools.pro - src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro -- src_plugins.depends = src_gui src_sql src_svg src_xml -+ src_plugins.depends = src_gui src_sql src_xml - src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS - src_s60installs.depends -= src_s60installs - contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { -@@ -72,9 +68,6 @@ src_testlib.target = sub-testlib - src_declarative.depends += src_opengl - src_webkit.depends += src_opengl - } -- contains(QT_CONFIG, svg) { -- src_declarative.depends += src_svg -- } - } - - -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile -index c8ef4fc..7984329 100644 ---- a/qtkernel/sync.profile -+++ b/qtkernel/sync.profile -@@ -6,7 +6,6 @@ - "QtXml" => "$basedir/src/xml", - "QtSql" => "$basedir/src/sql", - "QtNetwork" => "$basedir/src/network", -- "QtSvg" => "$basedir/src/svg", - "QtTest" => "$basedir/src/testlib", - "QtDBus" => "$basedir/src/dbus", - ); -@@ -32,7 +31,6 @@ - "core" => "#include <QtCore/QtCore>\n", - "gui" => "#include <QtGui/QtGui>\n", - "network" => "#include <QtNetwork/QtNetwork>\n", -- "svg" => "#include <QtSvg/QtSvg>\n", - "opengl" => "#include <QtOpenGL/QtOpenGL>\n", - "openvg" => "#include <QtOpenVG/QtOpenVG>\n", - "xml" => "#include <QtXml/QtXml>\n", -@@ -45,7 +43,6 @@ - "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri", - "QtOpenVG" => "$basedir/src/modules/qt_openvg.pri", - "QtSql" => "$basedir/src/modules/qt_sql.pri", -- "QtSvg" => "$basedir/src/modules/qt_svg.pri", - "QtTest" => "$basedir/src/modules/qt_testlib.pri", - "QtXml" => "$basedir/src/modules/qt_xml.pri", - ); -diff --git a/qtkernel/src/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri -similarity index 82% -rename from qtkernel/src/modules/qt_svg.pri -rename to qtsvg/modules/qt_svg.pri -index 90df93f..5fa3212 100644 ---- a/qtkernel/src/modules/qt_svg.pri -+++ b/qtsvg/modules/qt_svg.pri -@@ -4,7 +4,7 @@ QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.svg.name = QtSvg --QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg -+QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg - QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private - QT.svg.sources = $$QT_MODULE_BASE/src/svg - QT.svg.libs = $$QT_MODULE_LIB_BASE -diff --git a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro -index 5c5a31e..642fb0f 100644 ---- a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro -+++ b/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro -@@ -1,12 +1,14 @@ -+load(qt_module) -+ - TARGET = qsvgicon --include(../../qpluginbase.pri) -+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) - - HEADERS += qsvgiconengine.h - SOURCES += main.cpp \ - qsvgiconengine.cpp - QT += xml svg - --QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/iconengines -+DESTDIR = $$QT_BUILD_TREE/plugins/iconengines - target.path += $$[QT_INSTALL_PLUGINS]/iconengines - INSTALLS += target - -diff --git a/qtsvg/src/plugins/imageformats/svg/svg.pro b/qtsvg/src/plugins/imageformats/svg/svg.pro -index bcf4c21..c3412b9 100644 ---- a/qtsvg/src/plugins/imageformats/svg/svg.pro -+++ b/qtsvg/src/plugins/imageformats/svg/svg.pro -@@ -1,12 +1,14 @@ -+load(qt_module) -+ - TARGET = qsvg --include(../../qpluginbase.pri) -+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) - - HEADERS += qsvgiohandler.h - SOURCES += main.cpp \ - qsvgiohandler.cpp - QT += xml svg - --QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats -+DESTDIR = $$QT_BUILD_TREE/plugins/imageformats - target.path += $$[QT_INSTALL_PLUGINS]/imageformats - INSTALLS += target - -diff --git a/qtsvg/src/svg/svg.pro b/qtsvg/src/svg/svg.pro -index 79f284a..3572d59 100644 ---- a/qtsvg/src/svg/svg.pro -+++ b/qtsvg/src/svg/svg.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = QtSvg - QPRO_PWD = $$PWD - QT = core gui -@@ -8,8 +10,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - --include(../qbase.pri) -- -+include($$QT_SOURCE_TREE/src/qbase.pri) - - HEADERS += \ - qsvggraphics_p.h \ -@@ -38,8 +39,8 @@ SOURCES += \ - qgraphicssvgitem.cpp \ - qsvggenerator.cpp - --INCLUDEPATH += ../3rdparty/harfbuzz/src -+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src - - symbian:TARGET.UID3=0x2001B2E2 - --include(../3rdparty/zlib_dependency.pri) -+include($$QT_SOURCE_TREE/src/3rdparty/zlib_dependency.pri) -diff --git a/qtsvg/sync.profile b/qtsvg/sync.profile -new file mode 100644 -index 0000000..275e96c ---- /dev/null -+++ b/qtsvg/sync.profile -@@ -0,0 +1,14 @@ -+%modules = ( # path to module name map -+ "QtSvg" => "$basedir/src/svg", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+); -+%mastercontent = ( -+ "core" => "#include <QtCore/QtCore>\n", -+ "gui" => "#include <QtGui/QtGui>\n", -+); -+%modulepris = ( -+ "QtSvg" => "$basedir/modules/qt_svg.pri", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch b/patches/master/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch deleted file mode 100644 index a94491a..0000000 --- a/patches/master/0028-Add-hardcoded-qclass_lib_map.h-based-on-4.8.patch +++ /dev/null @@ -1,1471 +0,0 @@ -From 9db33c8d9be3bcdbc0b26b2243c9f6da6cf39caa Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Mon, 3 Jan 2011 13:09:28 -0600 -Subject: [PATCH] Add hardcoded qclass_lib_map.h based on 4.8 - -This is only until UIC/Designer handles this properly ---- - qtkernel/bin/syncqt | 2 +- - qtkernel/src/tools/uic/qclass_lib_map.h | 1437 +++++++++++++++++++++++++++++++ - 2 files changed, 1438 insertions(+), 1 deletions(-) - create mode 100644 qtkernel/src/tools/uic/qclass_lib_map.h - -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index afe873f..0894c80 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -44,7 +44,7 @@ my $force_win = 0; - my $force_relative = 0; - my $check_includes = 0; - my $copy_headers = 0; --my $create_uic_class_map = 1; -+my $create_uic_class_map = 0; - my $create_private_headers = 1; - my $no_module_fwd = 0; - my @modules_to_sync ; -diff --git a/qtkernel/src/tools/uic/qclass_lib_map.h b/qtkernel/src/tools/uic/qclass_lib_map.h -new file mode 100644 -index 0000000..35b4f92 ---- /dev/null -+++ b/qtkernel/src/tools/uic/qclass_lib_map.h -@@ -0,0 +1,1437 @@ -+QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h) -+QT_CLASS_LIB(QAnimationDriver, QtCore, qabstractanimation.h) -+QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h) -+QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h) -+QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h) -+QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h) -+QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h) -+QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h) -+QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h) -+QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h) -+QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h) -+QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h) -+QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h) -+QT_CLASS_LIB(QFuture, QtCore, qfuture.h) -+QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h) -+QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h) -+QT_CLASS_LIB(QFuture, QtCore, qfuture.h) -+QT_CLASS_LIB(QFutureInterfaceBase, QtCore, qfutureinterface.h) -+QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h) -+QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h) -+QT_CLASS_LIB(QFutureSynchronizer, QtCore, qfuturesynchronizer.h) -+QT_CLASS_LIB(QFutureWatcherBase, QtCore, qfuturewatcher.h) -+QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h) -+QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h) -+QT_CLASS_LIB(QRunnable, QtCore, qrunnable.h) -+QT_CLASS_LIB(QtConcurrentFilter, QtCore, qtconcurrentfilter.h) -+QT_CLASS_LIB(QtConcurrentMap, QtCore, qtconcurrentmap.h) -+QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h) -+QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h) -+QT_CLASS_LIB(QtEndian, QtCore, qendian.h) -+QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h) -+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) -+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) -+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) -+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) -+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) -+QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h) -+QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h) -+QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h) -+QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h) -+QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h) -+QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h) -+QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h) -+QT_CLASS_LIB(QBool, QtCore, qglobal.h) -+QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h) -+QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h) -+QT_CLASS_LIB(QFlag, QtCore, qglobal.h) -+QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h) -+QT_CLASS_LIB(QFlags, QtCore, qglobal.h) -+QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h) -+QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h) -+QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h) -+QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h) -+QT_CLASS_LIB(Qt, QtCore, qnamespace.h) -+QT_CLASS_LIB(QInternal, QtCore, qnamespace.h) -+QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h) -+QT_CLASS_LIB(QtConfig, QtCore, qconfig.h) -+QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h) -+QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h) -+QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h) -+QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h) -+QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h) -+QT_CLASS_LIB(QtDebug, QtCore, qdebug.h) -+QT_CLASS_LIB(QDebug, QtCore, qdebug.h) -+QT_CLASS_LIB(QNoDebug, QtCore, qdebug.h) -+QT_CLASS_LIB(QDir, QtCore, qdir.h) -+QT_CLASS_LIB(QDirIterator, QtCore, qdiriterator.h) -+QT_CLASS_LIB(QFile, QtCore, qfile.h) -+QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h) -+QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h) -+QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h) -+QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h) -+QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h) -+QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h) -+QT_CLASS_LIB(Q_PID, QtCore, qprocess.h) -+QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h) -+QT_CLASS_LIB(QProcess, QtCore, qprocess.h) -+QT_CLASS_LIB(QResource, QtCore, qresource.h) -+QT_CLASS_LIB(QSettings, QtCore, qsettings.h) -+QT_CLASS_LIB(QTemporaryFile, QtCore, qtemporaryfile.h) -+QT_CLASS_LIB(QTextStream, QtCore, qtextstream.h) -+QT_CLASS_LIB(QTextStreamFunction, QtCore, qtextstream.h) -+QT_CLASS_LIB(QTextStreamManipulator, QtCore, qtextstream.h) -+QT_CLASS_LIB(QTS, QtCore, qtextstream.h) -+QT_CLASS_LIB(QTextIStream, QtCore, qtextstream.h) -+QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h) -+QT_CLASS_LIB(QUrl, QtCore, qurl.h) -+QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h) -+QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h) -+QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h) -+QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h) -+QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h) -+QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h) -+QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h) -+QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h) -+QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h) -+QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h) -+QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h) -+QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h) -+QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h) -+QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h) -+QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h) -+QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h) -+QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h) -+QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h) -+QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h) -+QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h) -+QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h) -+QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h) -+QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h) -+QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h) -+QT_CLASS_LIB(QObjectList, QtCore, qobject.h) -+QT_CLASS_LIB(QObjectData, QtCore, qobject.h) -+QT_CLASS_LIB(QObject, QtCore, qobject.h) -+QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h) -+QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h) -+QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h) -+QT_CLASS_LIB(QPointer, QtCore, qpointer.h) -+QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h) -+QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h) -+QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h) -+QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h) -+QT_CLASS_LIB(QTimer, QtCore, qtimer.h) -+QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h) -+QT_CLASS_LIB(QVariant, QtCore, qvariant.h) -+QT_CLASS_LIB(QVariantList, QtCore, qvariant.h) -+QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h) -+QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h) -+QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h) -+QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h) -+QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h) -+QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h) -+QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h) -+QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h) -+QT_CLASS_LIB(QUuid, QtCore, quuid.h) -+QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h) -+QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h) -+QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h) -+QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h) -+QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h) -+QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h) -+QT_CLASS_LIB(QState, QtCore, qstate.h) -+QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h) -+QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h) -+QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h) -+QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h) -+QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h) -+QT_CLASS_LIB(QMutex, QtCore, qmutex.h) -+QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h) -+QT_CLASS_LIB(QMutexData, QtCore, qmutex.h) -+QT_CLASS_LIB(QMutex, QtCore, qmutex.h) -+QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h) -+QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h) -+QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h) -+QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h) -+QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h) -+QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h) -+QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h) -+QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h) -+QT_CLASS_LIB(QThread, QtCore, qthread.h) -+QT_CLASS_LIB(QThread, QtCore, qthread.h) -+QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h) -+QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h) -+QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h) -+QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h) -+QT_CLASS_LIB(QtAlgorithms, QtCore, qalgorithms.h) -+QT_CLASS_LIB(QBitArray, QtCore, qbitarray.h) -+QT_CLASS_LIB(QBitRef, QtCore, qbitarray.h) -+QT_CLASS_LIB(QByteArray, QtCore, qbytearray.h) -+QT_CLASS_LIB(QByteRef, QtCore, qbytearray.h) -+QT_CLASS_LIB(QByteArrayMatcher, QtCore, qbytearraymatcher.h) -+QT_CLASS_LIB(QCache, QtCore, qcache.h) -+QT_CLASS_LIB(QLatin1Char, QtCore, qchar.h) -+QT_CLASS_LIB(QChar, QtCore, qchar.h) -+QT_CLASS_LIB(QtContainerFwd, QtCore, qcontainerfwd.h) -+QT_CLASS_LIB(QContiguousCacheData, QtCore, qcontiguouscache.h) -+QT_CLASS_LIB(QContiguousCacheTypedData, QtCore, qcontiguouscache.h) -+QT_CLASS_LIB(QContiguousCache, QtCore, qcontiguouscache.h) -+QT_CLASS_LIB(QCryptographicHash, QtCore, qcryptographichash.h) -+QT_CLASS_LIB(QDate, QtCore, qdatetime.h) -+QT_CLASS_LIB(QTime, QtCore, qdatetime.h) -+QT_CLASS_LIB(QDateTime, QtCore, qdatetime.h) -+QT_CLASS_LIB(QEasingCurve, QtCore, qeasingcurve.h) -+QT_CLASS_LIB(QElapsedTimer, QtCore, qelapsedtimer.h) -+QT_CLASS_LIB(QHashData, QtCore, qhash.h) -+QT_CLASS_LIB(QHashDummyValue, QtCore, qhash.h) -+QT_CLASS_LIB(QHashDummyNode, QtCore, qhash.h) -+QT_CLASS_LIB(QHashNode, QtCore, qhash.h) -+QT_CLASS_LIB(QHash, QtCore, qhash.h) -+QT_CLASS_LIB(QMultiHash, QtCore, qhash.h) -+QT_CLASS_LIB(QHashIterator, QtCore, qhash.h) -+QT_CLASS_LIB(QMutableHashIterator, QtCore, qhash.h) -+QT_CLASS_LIB(QHashIterator, QtCore, qhash.h) -+QT_CLASS_LIB(QMutableHashIterator, QtCore, qhash.h) -+QT_CLASS_LIB(QLine, QtCore, qline.h) -+QT_CLASS_LIB(QLineF, QtCore, qline.h) -+QT_CLASS_LIB(QLinkedListData, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QLinkedListNode, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QLinkedList, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QLinkedListIterator, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QMutableLinkedListIterator, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QLinkedListIterator, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QMutableLinkedListIterator, QtCore, qlinkedlist.h) -+QT_CLASS_LIB(QListData, QtCore, qlist.h) -+QT_CLASS_LIB(QList, QtCore, qlist.h) -+QT_CLASS_LIB(QListIterator, QtCore, qlist.h) -+QT_CLASS_LIB(QMutableListIterator, QtCore, qlist.h) -+QT_CLASS_LIB(QListIterator, QtCore, qlist.h) -+QT_CLASS_LIB(QMutableListIterator, QtCore, qlist.h) -+QT_CLASS_LIB(QSystemLocale, QtCore, qlocale.h) -+QT_CLASS_LIB(QLocale, QtCore, qlocale.h) -+QT_CLASS_LIB(QMapData, QtCore, qmap.h) -+QT_CLASS_LIB(QMapNode, QtCore, qmap.h) -+QT_CLASS_LIB(QMapPayloadNode, QtCore, qmap.h) -+QT_CLASS_LIB(QMap, QtCore, qmap.h) -+QT_CLASS_LIB(QMultiMap, QtCore, qmap.h) -+QT_CLASS_LIB(QMapIterator, QtCore, qmap.h) -+QT_CLASS_LIB(QMutableMapIterator, QtCore, qmap.h) -+QT_CLASS_LIB(QMapIterator, QtCore, qmap.h) -+QT_CLASS_LIB(QMutableMapIterator, QtCore, qmap.h) -+QT_CLASS_LIB(QMargins, QtCore, qmargins.h) -+QT_CLASS_LIB(QPair, QtCore, qpair.h) -+QT_CLASS_LIB(QPoint, QtCore, qpoint.h) -+QT_CLASS_LIB(QPointF, QtCore, qpoint.h) -+QT_CLASS_LIB(QQueue, QtCore, qqueue.h) -+QT_CLASS_LIB(QRect, QtCore, qrect.h) -+QT_CLASS_LIB(QRectF, QtCore, qrect.h) -+QT_CLASS_LIB(QRegExp, QtCore, qregexp.h) -+QT_CLASS_LIB(QScopedPointerDeleter, QtCore, qscopedpointer.h) -+QT_CLASS_LIB(QScopedPointerArrayDeleter, QtCore, qscopedpointer.h) -+QT_CLASS_LIB(QScopedPointerPodDeleter, QtCore, qscopedpointer.h) -+QT_CLASS_LIB(QScopedPointer, QtCore, qscopedpointer.h) -+QT_CLASS_LIB(QScopedArrayPointer, QtCore, qscopedpointer.h) -+QT_CLASS_LIB(QSet, QtCore, qset.h) -+QT_CLASS_LIB(QSetIterator, QtCore, qset.h) -+QT_CLASS_LIB(QMutableSetIterator, QtCore, qset.h) -+QT_CLASS_LIB(QMutableSetIterator, QtCore, qset.h) -+QT_CLASS_LIB(QSharedData, QtCore, qshareddata.h) -+QT_CLASS_LIB(QSharedDataPointer, QtCore, qshareddata.h) -+QT_CLASS_LIB(QExplicitlySharedDataPointer, QtCore, qshareddata.h) -+QT_CLASS_LIB(QSharedPointer, QtCore, qsharedpointer.h) -+QT_CLASS_LIB(QWeakPointer, QtCore, qsharedpointer.h) -+QT_CLASS_LIB(QSize, QtCore, qsize.h) -+QT_CLASS_LIB(QSizeF, QtCore, qsize.h) -+QT_CLASS_LIB(QStack, QtCore, qstack.h) -+QT_CLASS_LIB(QStdWString, QtCore, qstring.h) -+QT_CLASS_LIB(QString, QtCore, qstring.h) -+QT_CLASS_LIB(QLatin1String, QtCore, qstring.h) -+QT_CLASS_LIB(QCharRef, QtCore, qstring.h) -+QT_CLASS_LIB(QConstString, QtCore, qstring.h) -+QT_CLASS_LIB(QStringRef, QtCore, qstring.h) -+QT_CLASS_LIB(QLatin1Literal, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QAbstractConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) -+QT_CLASS_LIB(QStringListIterator, QtCore, qstringlist.h) -+QT_CLASS_LIB(QMutableStringListIterator, QtCore, qstringlist.h) -+QT_CLASS_LIB(QStringList, QtCore, qstringlist.h) -+QT_CLASS_LIB(QStringMatcher, QtCore, qstringmatcher.h) -+QT_CLASS_LIB(QTextBoundaryFinder, QtCore, qtextboundaryfinder.h) -+QT_CLASS_LIB(QTimeLine, QtCore, qtimeline.h) -+QT_CLASS_LIB(QVarLengthArray, QtCore, qvarlengtharray.h) -+QT_CLASS_LIB(QVectorData, QtCore, qvector.h) -+QT_CLASS_LIB(QVectorTypedData, QtCore, qvector.h) -+QT_CLASS_LIB(QVector, QtCore, qvector.h) -+QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h) -+QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h) -+QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h) -+QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h) -+QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h) -+QT_CLASS_LIB(QDeclarativeItem, QtDeclarative, qdeclarativeitem.h) -+QT_CLASS_LIB(QDeclarativeComponent, QtDeclarative, qdeclarativecomponent.h) -+QT_CLASS_LIB(QDeclarativeContext, QtDeclarative, qdeclarativecontext.h) -+QT_CLASS_LIB(QDeclarativeEngine, QtDeclarative, qdeclarativeengine.h) -+QT_CLASS_LIB(QDeclarativeError, QtDeclarative, qdeclarativeerror.h) -+QT_CLASS_LIB(QDeclarativeExpression, QtDeclarative, qdeclarativeexpression.h) -+QT_CLASS_LIB(QDeclarativeExtensionInterface, QtDeclarative, qdeclarativeextensioninterface.h) -+QT_CLASS_LIB(QDeclarativeExtensionPlugin, QtDeclarative, qdeclarativeextensionplugin.h) -+QT_CLASS_LIB(QDeclarativeImageProvider, QtDeclarative, qdeclarativeimageprovider.h) -+QT_CLASS_LIB(QDeclarativeInfo, QtDeclarative, qdeclarativeinfo.h) -+QT_CLASS_LIB(QDeclarativeListProperty, QtDeclarative, qdeclarativelist.h) -+QT_CLASS_LIB(QDeclarativeListReference, QtDeclarative, qdeclarativelist.h) -+QT_CLASS_LIB(QDeclarativeNetworkAccessManagerFactory, QtDeclarative, qdeclarativenetworkaccessmanagerfactory.h) -+QT_CLASS_LIB(QDeclarativeParserStatus, QtDeclarative, qdeclarativeparserstatus.h) -+QT_CLASS_LIB(QDeclarativeAttachedPropertiesFunc, QtDeclarative, qdeclarativeprivate.h) -+QT_CLASS_LIB(QDeclarativeTypeInfo, QtDeclarative, qdeclarativeprivate.h) -+QT_CLASS_LIB(QDeclarativeProperty, QtDeclarative, qdeclarativeproperty.h) -+QT_CLASS_LIB(QDeclarativeProperties, QtDeclarative, qdeclarativeproperty.h) -+QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepropertyvalueinterceptor.h) -+QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h) -+QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h) -+QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h) -+QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h) -+QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QMacCompatGLuint, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QMacCompatGLenum, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QGLFormat, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QGLContext, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QGLWidget, QtOpenGL, qgl.h) -+QT_CLASS_LIB(QGLBuffer, QtOpenGL, qglbuffer.h) -+QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h) -+QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h) -+QT_CLASS_LIB(QGLFramebufferObjectFormat, QtOpenGL, qglframebufferobject.h) -+QT_CLASS_LIB(QGLFunctions, QtOpenGL, qglfunctions.h) -+QT_CLASS_LIB(QGLFunctionsPrivate, QtOpenGL, qglfunctions.h) -+QT_CLASS_LIB(QGLPixelBuffer, QtOpenGL, qglpixelbuffer.h) -+QT_CLASS_LIB(QGLScreenSurfaceFunctions, QtOpenGL, qglscreen_qws.h) -+QT_CLASS_LIB(QGLScreen, QtOpenGL, qglscreen_qws.h) -+QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h) -+QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h) -+QT_CLASS_LIB(QDomImplementation, QtXml, qdom.h) -+QT_CLASS_LIB(QDomNode, QtXml, qdom.h) -+QT_CLASS_LIB(QDomNodeList, QtXml, qdom.h) -+QT_CLASS_LIB(QDomDocumentType, QtXml, qdom.h) -+QT_CLASS_LIB(QDomDocument, QtXml, qdom.h) -+QT_CLASS_LIB(QDomNamedNodeMap, QtXml, qdom.h) -+QT_CLASS_LIB(QDomDocumentFragment, QtXml, qdom.h) -+QT_CLASS_LIB(QDomCharacterData, QtXml, qdom.h) -+QT_CLASS_LIB(QDomAttr, QtXml, qdom.h) -+QT_CLASS_LIB(QDomElement, QtXml, qdom.h) -+QT_CLASS_LIB(QDomText, QtXml, qdom.h) -+QT_CLASS_LIB(QDomComment, QtXml, qdom.h) -+QT_CLASS_LIB(QDomCDATASection, QtXml, qdom.h) -+QT_CLASS_LIB(QDomNotation, QtXml, qdom.h) -+QT_CLASS_LIB(QDomEntity, QtXml, qdom.h) -+QT_CLASS_LIB(QDomEntityReference, QtXml, qdom.h) -+QT_CLASS_LIB(QDomProcessingInstruction, QtXml, qdom.h) -+QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlReader, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h) -+QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamEntityResolver, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamReader, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h) -+QT_CLASS_LIB(QNetworkCacheMetaData, QtNetwork, qabstractnetworkcache.h) -+QT_CLASS_LIB(QAbstractNetworkCache, QtNetwork, qabstractnetworkcache.h) -+QT_CLASS_LIB(QFtp, QtNetwork, qftp.h) -+QT_CLASS_LIB(QHttpHeader, QtNetwork, qhttp.h) -+QT_CLASS_LIB(QHttpResponseHeader, QtNetwork, qhttp.h) -+QT_CLASS_LIB(QHttpRequestHeader, QtNetwork, qhttp.h) -+QT_CLASS_LIB(QHttp, QtNetwork, qhttp.h) -+QT_CLASS_LIB(QNetworkAccessManager, QtNetwork, qnetworkaccessmanager.h) -+QT_CLASS_LIB(QNetworkCookie, QtNetwork, qnetworkcookie.h) -+QT_CLASS_LIB(QNetworkCookieJar, QtNetwork, qnetworkcookiejar.h) -+QT_CLASS_LIB(QNetworkDiskCache, QtNetwork, qnetworkdiskcache.h) -+QT_CLASS_LIB(QNetworkReply, QtNetwork, qnetworkreply.h) -+QT_CLASS_LIB(QNetworkRequest, QtNetwork, qnetworkrequest.h) -+QT_CLASS_LIB(QNetworkConfigurationManager, QtNetwork, qnetworkconfigmanager.h) -+QT_CLASS_LIB(QNetworkConfiguration, QtNetwork, qnetworkconfiguration.h) -+QT_CLASS_LIB(QNetworkSession, QtNetwork, qnetworksession.h) -+QT_CLASS_LIB(QAuthenticator, QtNetwork, qauthenticator.h) -+QT_CLASS_LIB(QIPv6Address, QtNetwork, qhostaddress.h) -+QT_CLASS_LIB(Q_IPV6ADDR, QtNetwork, qhostaddress.h) -+QT_CLASS_LIB(QHostAddress, QtNetwork, qhostaddress.h) -+QT_CLASS_LIB(QHostInfo, QtNetwork, qhostinfo.h) -+QT_CLASS_LIB(QNetworkAddressEntry, QtNetwork, qnetworkinterface.h) -+QT_CLASS_LIB(QNetworkInterface, QtNetwork, qnetworkinterface.h) -+QT_CLASS_LIB(QNetworkProxyQuery, QtNetwork, qnetworkproxy.h) -+QT_CLASS_LIB(QNetworkProxy, QtNetwork, qnetworkproxy.h) -+QT_CLASS_LIB(QNetworkProxyFactory, QtNetwork, qnetworkproxy.h) -+QT_CLASS_LIB(QUrlInfo, QtNetwork, qurlinfo.h) -+QT_CLASS_LIB(QAbstractSocket, QtNetwork, qabstractsocket.h) -+QT_CLASS_LIB(QLocalServer, QtNetwork, qlocalserver.h) -+QT_CLASS_LIB(QLocalSocket, QtNetwork, qlocalsocket.h) -+QT_CLASS_LIB(QTcpServer, QtNetwork, qtcpserver.h) -+QT_CLASS_LIB(QTcpSocket, QtNetwork, qtcpsocket.h) -+QT_CLASS_LIB(QUdpSocket, QtNetwork, qudpsocket.h) -+QT_CLASS_LIB(QSsl, QtNetwork, qssl.h) -+QT_CLASS_LIB(QSslCertificate, QtNetwork, qsslcertificate.h) -+QT_CLASS_LIB(QSslCipher, QtNetwork, qsslcipher.h) -+QT_CLASS_LIB(QSslConfiguration, QtNetwork, qsslconfiguration.h) -+QT_CLASS_LIB(QSslError, QtNetwork, qsslerror.h) -+QT_CLASS_LIB(QSslKey, QtNetwork, qsslkey.h) -+QT_CLASS_LIB(QSslSocket, QtNetwork, qsslsocket.h) -+QT_CLASS_LIB(QHelpGlobal, QtHelp, qhelp_global.h) -+QT_CLASS_LIB(QHelpContentItem, QtHelp, qhelpcontentwidget.h) -+QT_CLASS_LIB(QHelpContentModel, QtHelp, qhelpcontentwidget.h) -+QT_CLASS_LIB(QHelpContentWidget, QtHelp, qhelpcontentwidget.h) -+QT_CLASS_LIB(QHelpEngine, QtHelp, qhelpengine.h) -+QT_CLASS_LIB(QHelpEngineCore, QtHelp, qhelpenginecore.h) -+QT_CLASS_LIB(QHelpIndexModel, QtHelp, qhelpindexwidget.h) -+QT_CLASS_LIB(QHelpIndexWidget, QtHelp, qhelpindexwidget.h) -+QT_CLASS_LIB(QHelpSearchQuery, QtHelp, qhelpsearchengine.h) -+QT_CLASS_LIB(QHelpSearchEngine, QtHelp, qhelpsearchengine.h) -+QT_CLASS_LIB(QHelpSearchQueryWidget, QtHelp, qhelpsearchquerywidget.h) -+QT_CLASS_LIB(QHelpSearchResultWidget, QtHelp, qhelpsearchresultwidget.h) -+QT_CLASS_LIB(QAbstractMessageHandler, QtXmlPatterns, qabstractmessagehandler.h) -+QT_CLASS_LIB(QAbstractUriResolver, QtXmlPatterns, qabstracturiresolver.h) -+QT_CLASS_LIB(QXmlNodeModelIndex, QtXmlPatterns, qabstractxmlnodemodel.h) -+QT_CLASS_LIB(QAbstractXmlNodeModel, QtXmlPatterns, qabstractxmlnodemodel.h) -+QT_CLASS_LIB(QXmlItem, QtXmlPatterns, qabstractxmlnodemodel.h) -+QT_CLASS_LIB(QAbstractXmlReceiver, QtXmlPatterns, qabstractxmlreceiver.h) -+QT_CLASS_LIB(QSimpleXmlNodeModel, QtXmlPatterns, qsimplexmlnodemodel.h) -+QT_CLASS_LIB(QSourceLocation, QtXmlPatterns, qsourcelocation.h) -+QT_CLASS_LIB(QXmlFormatter, QtXmlPatterns, qxmlformatter.h) -+QT_CLASS_LIB(QXmlName, QtXmlPatterns, qxmlname.h) -+QT_CLASS_LIB(QXmlNamePool, QtXmlPatterns, qxmlnamepool.h) -+QT_CLASS_LIB(QXmlQuery, QtXmlPatterns, qxmlquery.h) -+QT_CLASS_LIB(QXmlResultItems, QtXmlPatterns, qxmlresultitems.h) -+QT_CLASS_LIB(QXmlSchema, QtXmlPatterns, qxmlschema.h) -+QT_CLASS_LIB(QXmlSchemaValidator, QtXmlPatterns, qxmlschemavalidator.h) -+QT_CLASS_LIB(QXmlSerializer, QtXmlPatterns, qxmlserializer.h) -+QT_CLASS_LIB(QMeeGoFenceSync, QtMeeGoGraphicsSystemHelper, qmeegofencesync.h) -+QT_CLASS_LIB(QMeeGoGraphicsSystemHelper, QtMeeGoGraphicsSystemHelper, qmeegographicssystemhelper.h) -+QT_CLASS_LIB(QMeeGoLivePixmap, QtMeeGoGraphicsSystemHelper, qmeegolivepixmap.h) -+QT_CLASS_LIB(QMeeGoOverlayWidget, QtMeeGoGraphicsSystemHelper, qmeegooverlaywidget.h) -+QT_CLASS_LIB(QMeeGoRuntime, QtMeeGoGraphicsSystemHelper, qmeegoruntime.h) -+QT_CLASS_LIB(QMeeGoSwitchEvent, QtMeeGoGraphicsSystemHelper, qmeegoswitchevent.h) -+QT_CLASS_LIB(QAxBase, ActiveQt, qaxbase.h) -+QT_CLASS_LIB(QAxObject, ActiveQt, qaxobject.h) -+QT_CLASS_LIB(QAxScriptEngine, ActiveQt, qaxscript.h) -+QT_CLASS_LIB(QAxScript, ActiveQt, qaxscript.h) -+QT_CLASS_LIB(QAxScriptManager, ActiveQt, qaxscript.h) -+QT_CLASS_LIB(QAxSelect, ActiveQt, qaxselect.h) -+QT_CLASS_LIB(QAxWidget, ActiveQt, qaxwidget.h) -+QT_CLASS_LIB(QAxAggregated, ActiveQt, qaxaggregated.h) -+QT_CLASS_LIB(QAxBindable, ActiveQt, qaxbindable.h) -+QT_CLASS_LIB(QAxFactory, ActiveQt, qaxfactory.h) -+QT_CLASS_LIB(QAxClass, ActiveQt, qaxfactory.h) -+QT_CLASS_LIB(QGraphicsWebView, QtWebKit, qgraphicswebview.h) -+QT_CLASS_LIB(QWebDatabase, QtWebKit, qwebdatabase.h) -+QT_CLASS_LIB(QWebElement, QtWebKit, qwebelement.h) -+QT_CLASS_LIB(QWebElementCollection, QtWebKit, qwebelement.h) -+QT_CLASS_LIB(QWebHitTestResult, QtWebKit, qwebframe.h) -+QT_CLASS_LIB(QWebFrame, QtWebKit, qwebframe.h) -+QT_CLASS_LIB(QWebHistoryItem, QtWebKit, qwebhistory.h) -+QT_CLASS_LIB(QWebHistory, QtWebKit, qwebhistory.h) -+QT_CLASS_LIB(QWebHistoryInterface, QtWebKit, qwebhistoryinterface.h) -+QT_CLASS_LIB(QWebInspector, QtWebKit, qwebinspector.h) -+QT_CLASS_LIB(QWebPage, QtWebKit, qwebpage.h) -+QT_CLASS_LIB(QWebPluginFactory, QtWebKit, qwebpluginfactory.h) -+QT_CLASS_LIB(QWebSecurityOrigin, QtWebKit, qwebsecurityorigin.h) -+QT_CLASS_LIB(QWebSettings, QtWebKit, qwebsettings.h) -+QT_CLASS_LIB(QWebView, QtWebKit, qwebview.h) -+QT_CLASS_LIB(QAudio, QtMultimedia, qaudio.h) -+QT_CLASS_LIB(QAudioDeviceInfo, QtMultimedia, qaudiodeviceinfo.h) -+QT_CLASS_LIB(QAbstractAudioDeviceInfo, QtMultimedia, qaudioengine.h) -+QT_CLASS_LIB(QAbstractAudioOutput, QtMultimedia, qaudioengine.h) -+QT_CLASS_LIB(QAbstractAudioInput, QtMultimedia, qaudioengine.h) -+QT_CLASS_LIB(QAudioEngineFactoryInterface, QtMultimedia, qaudioengineplugin.h) -+QT_CLASS_LIB(QAudioEnginePlugin, QtMultimedia, qaudioengineplugin.h) -+QT_CLASS_LIB(QAudioFormat, QtMultimedia, qaudioformat.h) -+QT_CLASS_LIB(QAudioInput, QtMultimedia, qaudioinput.h) -+QT_CLASS_LIB(QAudioOutput, QtMultimedia, qaudiooutput.h) -+QT_CLASS_LIB(QAbstractVideoBuffer, QtMultimedia, qabstractvideobuffer.h) -+QT_CLASS_LIB(QAbstractVideoSurface, QtMultimedia, qabstractvideosurface.h) -+QT_CLASS_LIB(QVideoFrame, QtMultimedia, qvideoframe.h) -+QT_CLASS_LIB(QVideoSurfaceFormat, QtMultimedia, qvideosurfaceformat.h) -+QT_CLASS_LIB(QSignalSpy, QtTest, qsignalspy.h) -+QT_CLASS_LIB(QTest, QtTest, qtest.h) -+QT_CLASS_LIB(QtTestGui, QtTest, qtest_gui.h) -+QT_CLASS_LIB(QTestAccessibilityEvent, QtTest, qtestaccessible.h) -+QT_CLASS_LIB(QTestAccessibility, QtTest, qtestaccessible.h) -+QT_CLASS_LIB(QTestBasicStreamer, QtTest, qtestbasicstreamer.h) -+QT_CLASS_LIB(QTestCoreElement, QtTest, qtestcoreelement.h) -+QT_CLASS_LIB(QTestCoreList, QtTest, qtestcorelist.h) -+QT_CLASS_LIB(QTestData, QtTest, qtestdata.h) -+QT_CLASS_LIB(QTestElement, QtTest, qtestelement.h) -+QT_CLASS_LIB(QTestElementAttribute, QtTest, qtestelementattribute.h) -+QT_CLASS_LIB(QTestEvent, QtTest, qtestevent.h) -+QT_CLASS_LIB(QTestKeyEvent, QtTest, qtestevent.h) -+QT_CLASS_LIB(QTestKeyClicksEvent, QtTest, qtestevent.h) -+QT_CLASS_LIB(QTestMouseEvent, QtTest, qtestevent.h) -+QT_CLASS_LIB(QTestDelayEvent, QtTest, qtestevent.h) -+QT_CLASS_LIB(QTestEventList, QtTest, qtestevent.h) -+QT_CLASS_LIB(QTestEventLoop, QtTest, qtesteventloop.h) -+QT_CLASS_LIB(QTestFileLogger, QtTest, qtestfilelogger.h) -+QT_CLASS_LIB(QTestLightXmlStreamer, QtTest, qtestlightxmlstreamer.h) -+QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h) -+QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h) -+QT_CLASS_LIB(QSpontaneKeyEvent, QtTest, qtestspontaneevent.h) -+QT_CLASS_LIB(QTestXmlStreamer, QtTest, qtestxmlstreamer.h) -+QT_CLASS_LIB(QTestXunitStreamer, QtTest, qtestxunitstreamer.h) -+QT_CLASS_LIB(QDBusAbstractAdaptor, QtDBus, qdbusabstractadaptor.h) -+QT_CLASS_LIB(QDBusAbstractInterfaceBase, QtDBus, qdbusabstractinterface.h) -+QT_CLASS_LIB(QDBusAbstractInterface, QtDBus, qdbusabstractinterface.h) -+QT_CLASS_LIB(QDBusArgument, QtDBus, qdbusargument.h) -+QT_CLASS_LIB(QDBusConnection, QtDBus, qdbusconnection.h) -+QT_CLASS_LIB(QDBusConnectionInterface, QtDBus, qdbusconnectioninterface.h) -+QT_CLASS_LIB(QDBusContext, QtDBus, qdbuscontext.h) -+QT_CLASS_LIB(QDBusError, QtDBus, qdbuserror.h) -+QT_CLASS_LIB(QDBusObjectPath, QtDBus, qdbusextratypes.h) -+QT_CLASS_LIB(QDBusSignature, QtDBus, qdbusextratypes.h) -+QT_CLASS_LIB(QDBusVariant, QtDBus, qdbusextratypes.h) -+QT_CLASS_LIB(QDBusInterface, QtDBus, qdbusinterface.h) -+QT_CLASS_LIB(QDBusMessage, QtDBus, qdbusmessage.h) -+QT_CLASS_LIB(QDBusMetaType, QtDBus, qdbusmetatype.h) -+QT_CLASS_LIB(QDBusPendingCall, QtDBus, qdbuspendingcall.h) -+QT_CLASS_LIB(QDBusPendingCallWatcher, QtDBus, qdbuspendingcall.h) -+QT_CLASS_LIB(QDBusPendingReplyData, QtDBus, qdbuspendingreply.h) -+QT_CLASS_LIB(QDBusPendingReply, QtDBus, qdbuspendingreply.h) -+QT_CLASS_LIB(QDBusReply, QtDBus, qdbusreply.h) -+QT_CLASS_LIB(QDBusReply, QtDBus, qdbusreply.h) -+QT_CLASS_LIB(QDBusServer, QtDBus, qdbusserver.h) -+QT_CLASS_LIB(QDBusServiceWatcher, QtDBus, qdbusservicewatcher.h) -+QT_CLASS_LIB(QScriptable, QtScript, qscriptable.h) -+QT_CLASS_LIB(QScriptClass, QtScript, qscriptclass.h) -+QT_CLASS_LIB(QScriptClassPropertyIterator, QtScript, qscriptclasspropertyiterator.h) -+QT_CLASS_LIB(QScriptContext, QtScript, qscriptcontext.h) -+QT_CLASS_LIB(QScriptContextInfo, QtScript, qscriptcontextinfo.h) -+QT_CLASS_LIB(QScriptContextInfoList, QtScript, qscriptcontextinfo.h) -+QT_CLASS_LIB(QScriptSyntaxCheckResult, QtScript, qscriptengine.h) -+QT_CLASS_LIB(QScriptEngine, QtScript, qscriptengine.h) -+QT_CLASS_LIB(QScriptEngineAgent, QtScript, qscriptengineagent.h) -+QT_CLASS_LIB(QScriptExtensionInterface, QtScript, qscriptextensioninterface.h) -+QT_CLASS_LIB(QScriptExtensionPlugin, QtScript, qscriptextensionplugin.h) -+QT_CLASS_LIB(QScriptProgram, QtScript, qscriptprogram.h) -+QT_CLASS_LIB(QScriptString, QtScript, qscriptstring.h) -+QT_CLASS_LIB(QScriptValueList, QtScript, qscriptvalue.h) -+QT_CLASS_LIB(QScriptValue, QtScript, qscriptvalue.h) -+QT_CLASS_LIB(QScriptValueIterator, QtScript, qscriptvalueiterator.h) -+QT_CLASS_LIB(QSqlDriverCreatorBase, QtSql, qsqldatabase.h) -+QT_CLASS_LIB(QSqlDriverCreator, QtSql, qsqldatabase.h) -+QT_CLASS_LIB(QSqlDatabase, QtSql, qsqldatabase.h) -+QT_CLASS_LIB(QSqlDriver, QtSql, qsqldriver.h) -+QT_CLASS_LIB(QSqlDriverFactoryInterface, QtSql, qsqldriverplugin.h) -+QT_CLASS_LIB(QSqlDriverPlugin, QtSql, qsqldriverplugin.h) -+QT_CLASS_LIB(QSqlError, QtSql, qsqlerror.h) -+QT_CLASS_LIB(QSqlField, QtSql, qsqlfield.h) -+QT_CLASS_LIB(QSqlIndex, QtSql, qsqlindex.h) -+QT_CLASS_LIB(QSqlQuery, QtSql, qsqlquery.h) -+QT_CLASS_LIB(QSqlRecord, QtSql, qsqlrecord.h) -+QT_CLASS_LIB(QSqlResult, QtSql, qsqlresult.h) -+QT_CLASS_LIB(QSqlQueryModel, QtSql, qsqlquerymodel.h) -+QT_CLASS_LIB(QSqlRelationalDelegate, QtSql, qsqlrelationaldelegate.h) -+QT_CLASS_LIB(QSqlRelation, QtSql, qsqlrelationaltablemodel.h) -+QT_CLASS_LIB(QSqlRelationalTableModel, QtSql, qsqlrelationaltablemodel.h) -+QT_CLASS_LIB(QSqlTableModel, QtSql, qsqltablemodel.h) -+QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h) -+QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h) -+QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h) -+QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h) -+QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h) -+QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h) -+QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h) -+QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h) -+QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h) -+QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h) -+QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h) -+QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h) -+QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h) -+QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h) -+QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h) -+QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h) -+QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h) -+QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h) -+QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h) -+QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h) -+QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h) -+QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h) -+QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h) -+QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h) -+QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h) -+QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h) -+QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h) -+QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h) -+QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h) -+QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h) -+QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h) -+QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h) -+QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h) -+QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h) -+QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h) -+QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h) -+QT_CLASS_LIB(QDialog, QtGui, qdialog.h) -+QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h) -+QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h) -+QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h) -+QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h) -+QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h) -+QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h) -+QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h) -+QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h) -+QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h) -+QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h) -+QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h) -+QT_CLASS_LIB(QWizard, QtGui, qwizard.h) -+QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h) -+QT_CLASS_LIB(QGraphicsEffect, QtGui, qgraphicseffect.h) -+QT_CLASS_LIB(QGraphicsColorizeEffect, QtGui, qgraphicseffect.h) -+QT_CLASS_LIB(QGraphicsBlurEffect, QtGui, qgraphicseffect.h) -+QT_CLASS_LIB(QGraphicsDropShadowEffect, QtGui, qgraphicseffect.h) -+QT_CLASS_LIB(QGraphicsOpacityEffect, QtGui, qgraphicseffect.h) -+QT_CLASS_LIB(QCopChannel, QtGui, qcopchannel_qws.h) -+QT_CLASS_LIB(QDecorationAction, QtGui, qdecoration_qws.h) -+QT_CLASS_LIB(QDecoration, QtGui, qdecoration_qws.h) -+QT_CLASS_LIB(QDecorationDefault, QtGui, qdecorationdefault_qws.h) -+QT_CLASS_LIB(QDecorationFactory, QtGui, qdecorationfactory_qws.h) -+QT_CLASS_LIB(QDecorationFactoryInterface, QtGui, qdecorationplugin_qws.h) -+QT_CLASS_LIB(QDecorationPlugin, QtGui, qdecorationplugin_qws.h) -+QT_CLASS_LIB(QDecorationStyled, QtGui, qdecorationstyled_qws.h) -+QT_CLASS_LIB(QDecorationWindows, QtGui, qdecorationwindows_qws.h) -+QT_CLASS_LIB(QDirectPainter, QtGui, qdirectpainter_qws.h) -+QT_CLASS_LIB(QWSKeyboardHandler, QtGui, qkbd_qws.h) -+QT_CLASS_LIB(QKbdDriverFactory, QtGui, qkbddriverfactory_qws.h) -+QT_CLASS_LIB(QWSKeyboardHandlerFactoryInterface, QtGui, qkbddriverplugin_qws.h) -+QT_CLASS_LIB(QKbdDriverPlugin, QtGui, qkbddriverplugin_qws.h) -+QT_CLASS_LIB(QWSLinuxInputKeyboardHandler, QtGui, qkbdlinuxinput_qws.h) -+QT_CLASS_LIB(QWSQnxKeyboardHandler, QtGui, qkbdqnx_qws.h) -+QT_CLASS_LIB(QWSTtyKeyboardHandler, QtGui, qkbdtty_qws.h) -+QT_CLASS_LIB(QWSUmKeyboardHandler, QtGui, qkbdum_qws.h) -+QT_CLASS_LIB(QVFbKeyboardHandler, QtGui, qkbdvfb_qws.h) -+QT_CLASS_LIB(QWSPointerCalibrationData, QtGui, qmouse_qws.h) -+QT_CLASS_LIB(QWSMouseHandler, QtGui, qmouse_qws.h) -+QT_CLASS_LIB(QWSCalibratedMouseHandler, QtGui, qmouse_qws.h) -+QT_CLASS_LIB(QMouseDriverFactory, QtGui, qmousedriverfactory_qws.h) -+QT_CLASS_LIB(QWSMouseHandlerFactoryInterface, QtGui, qmousedriverplugin_qws.h) -+QT_CLASS_LIB(QMouseDriverPlugin, QtGui, qmousedriverplugin_qws.h) -+QT_CLASS_LIB(QWSLinuxInputMouseHandler, QtGui, qmouselinuxinput_qws.h) -+QT_CLASS_LIB(QWSLinuxTPMouseHandler, QtGui, qmouselinuxtp_qws.h) -+QT_CLASS_LIB(QWSPcMouseHandler, QtGui, qmousepc_qws.h) -+QT_CLASS_LIB(QQnxMouseHandler, QtGui, qmouseqnx_qws.h) -+QT_CLASS_LIB(QWSTslibMouseHandler, QtGui, qmousetslib_qws.h) -+QT_CLASS_LIB(QVFbMouseHandler, QtGui, qmousevfb_qws.h) -+QT_CLASS_LIB(QScreenCursor, QtGui, qscreen_qws.h) -+QT_CLASS_LIB(QPoolEntry, QtGui, qscreen_qws.h) -+QT_CLASS_LIB(QScreen, QtGui, qscreen_qws.h) -+QT_CLASS_LIB(QScreenDriverFactory, QtGui, qscreendriverfactory_qws.h) -+QT_CLASS_LIB(QScreenDriverFactoryInterface, QtGui, qscreendriverplugin_qws.h) -+QT_CLASS_LIB(QScreenDriverPlugin, QtGui, qscreendriverplugin_qws.h) -+QT_CLASS_LIB(QLinuxFb_Shared, QtGui, qscreenlinuxfb_qws.h) -+QT_CLASS_LIB(QLinuxFbScreen, QtGui, qscreenlinuxfb_qws.h) -+QT_CLASS_LIB(QProxyScreenCursor, QtGui, qscreenproxy_qws.h) -+QT_CLASS_LIB(QProxyScreen, QtGui, qscreenproxy_qws.h) -+QT_CLASS_LIB(QQnxScreen, QtGui, qscreenqnx_qws.h) -+QT_CLASS_LIB(QTransformedScreen, QtGui, qscreentransformed_qws.h) -+QT_CLASS_LIB(QVFbScreen, QtGui, qscreenvfb_qws.h) -+QT_CLASS_LIB(QWSSoundServer, QtGui, qsoundqss_qws.h) -+QT_CLASS_LIB(QWSSoundClient, QtGui, qsoundqss_qws.h) -+QT_CLASS_LIB(QWSSoundServerSocket, QtGui, qsoundqss_qws.h) -+QT_CLASS_LIB(QTransportAuth, QtGui, qtransportauth_qws.h) -+QT_CLASS_LIB(QAuthDevice, QtGui, qtransportauth_qws.h) -+QT_CLASS_LIB(QVFbHeader, QtGui, qvfbhdr.h) -+QT_CLASS_LIB(QVFbKeyData, QtGui, qvfbhdr.h) -+QT_CLASS_LIB(QWSInternalWindowInfo, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSScreenSaver, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSWindow, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSSoundServer, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSServer, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSInputMethod, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSCursorMap, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSClient, QtGui, qwindowsystem_qws.h) -+QT_CLASS_LIB(QWSCursor, QtGui, qwscursor_qws.h) -+QT_CLASS_LIB(QWSWindowInfo, QtGui, qwsdisplay_qws.h) -+QT_CLASS_LIB(QWSDisplay, QtGui, qwsdisplay_qws.h) -+QT_CLASS_LIB(QWSEmbedWidget, QtGui, qwsembedwidget.h) -+QT_CLASS_LIB(QWSEvent, QtGui, qwsevent_qws.h) -+QT_CLASS_LIB(QWSManager, QtGui, qwsmanager_qws.h) -+QT_CLASS_LIB(QWSPropertyManager, QtGui, qwsproperty_qws.h) -+QT_CLASS_LIB(QWSProtocolItem, QtGui, qwsprotocolitem_qws.h) -+QT_CLASS_LIB(QWSSocket, QtGui, qwssocket_qws.h) -+QT_CLASS_LIB(QWSServerSocket, QtGui, qwssocket_qws.h) -+QT_CLASS_LIB(QGraphicsAnchor, QtGui, qgraphicsanchorlayout.h) -+QT_CLASS_LIB(QGraphicsAnchorLayout, QtGui, qgraphicsanchorlayout.h) -+QT_CLASS_LIB(QGraphicsGridLayout, QtGui, qgraphicsgridlayout.h) -+QT_CLASS_LIB(QGraphicsItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsObject, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QAbstractGraphicsShapeItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsPathItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsRectItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsEllipseItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsPolygonItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsLineItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsPixmapItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsTextItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsSimpleTextItem, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsItemGroup, QtGui, qgraphicsitem.h) -+QT_CLASS_LIB(QGraphicsItemAnimation, QtGui, qgraphicsitemanimation.h) -+QT_CLASS_LIB(QGraphicsLayout, QtGui, qgraphicslayout.h) -+QT_CLASS_LIB(QGraphicsLayoutItem, QtGui, qgraphicslayoutitem.h) -+QT_CLASS_LIB(QGraphicsLinearLayout, QtGui, qgraphicslinearlayout.h) -+QT_CLASS_LIB(QGraphicsProxyWidget, QtGui, qgraphicsproxywidget.h) -+QT_CLASS_LIB(QGraphicsScene, QtGui, qgraphicsscene.h) -+QT_CLASS_LIB(QGraphicsSceneEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneMouseEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneWheelEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneContextMenuEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneHoverEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneHelpEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneDragDropEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneResizeEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsSceneMoveEvent, QtGui, qgraphicssceneevent.h) -+QT_CLASS_LIB(QGraphicsTransform, QtGui, qgraphicstransform.h) -+QT_CLASS_LIB(QGraphicsScale, QtGui, qgraphicstransform.h) -+QT_CLASS_LIB(QGraphicsRotation, QtGui, qgraphicstransform.h) -+QT_CLASS_LIB(QGraphicsView, QtGui, qgraphicsview.h) -+QT_CLASS_LIB(QGraphicsWidget, QtGui, qgraphicswidget.h) -+QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h) -+QT_CLASS_LIB(QIcon, QtGui, qicon.h) -+QT_CLASS_LIB(QIconSet, QtGui, qicon.h) -+QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h) -+QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h) -+QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h) -+QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h) -+QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h) -+QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h) -+QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h) -+QT_CLASS_LIB(QImage, QtGui, qimage.h) -+QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h) -+QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h) -+QT_CLASS_LIB(QImageIOPlugin, QtGui, qimageiohandler.h) -+QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h) -+QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h) -+QT_CLASS_LIB(QMovie, QtGui, qmovie.h) -+QT_CLASS_LIB(QPicture, QtGui, qpicture.h) -+QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h) -+QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h) -+QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h) -+QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h) -+QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h) -+QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h) -+QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h) -+QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h) -+QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h) -+QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h) -+QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h) -+QT_CLASS_LIB(QAbstractProxyModel, QtGui, qabstractproxymodel.h) -+QT_CLASS_LIB(QColumnView, QtGui, qcolumnview.h) -+QT_CLASS_LIB(QDataWidgetMapper, QtGui, qdatawidgetmapper.h) -+QT_CLASS_LIB(QDirModel, QtGui, qdirmodel.h) -+QT_CLASS_LIB(QFileIconProvider, QtGui, qfileiconprovider.h) -+QT_CLASS_LIB(QHeaderView, QtGui, qheaderview.h) -+QT_CLASS_LIB(QItemDelegate, QtGui, qitemdelegate.h) -+QT_CLASS_LIB(QItemEditorCreatorBase, QtGui, qitemeditorfactory.h) -+QT_CLASS_LIB(QItemEditorCreator, QtGui, qitemeditorfactory.h) -+QT_CLASS_LIB(QStandardItemEditorCreator, QtGui, qitemeditorfactory.h) -+QT_CLASS_LIB(QItemEditorFactory, QtGui, qitemeditorfactory.h) -+QT_CLASS_LIB(QItemSelectionRange, QtGui, qitemselectionmodel.h) -+QT_CLASS_LIB(QItemSelectionModel, QtGui, qitemselectionmodel.h) -+QT_CLASS_LIB(QItemSelection, QtGui, qitemselectionmodel.h) -+QT_CLASS_LIB(QListView, QtGui, qlistview.h) -+QT_CLASS_LIB(QListWidgetItem, QtGui, qlistwidget.h) -+QT_CLASS_LIB(QListWidget, QtGui, qlistwidget.h) -+QT_CLASS_LIB(QProxyModel, QtGui, qproxymodel.h) -+QT_CLASS_LIB(QSortFilterProxyModel, QtGui, qsortfilterproxymodel.h) -+QT_CLASS_LIB(QStandardItem, QtGui, qstandarditemmodel.h) -+QT_CLASS_LIB(QStandardItemModel, QtGui, qstandarditemmodel.h) -+QT_CLASS_LIB(QStringListModel, QtGui, qstringlistmodel.h) -+QT_CLASS_LIB(QStyledItemDelegate, QtGui, qstyleditemdelegate.h) -+QT_CLASS_LIB(QTableView, QtGui, qtableview.h) -+QT_CLASS_LIB(QTableWidgetSelectionRange, QtGui, qtablewidget.h) -+QT_CLASS_LIB(QTableWidgetItem, QtGui, qtablewidget.h) -+QT_CLASS_LIB(QTableWidget, QtGui, qtablewidget.h) -+QT_CLASS_LIB(QTreeView, QtGui, qtreeview.h) -+QT_CLASS_LIB(QTreeWidgetItem, QtGui, qtreewidget.h) -+QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h) -+QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h) -+QT_CLASS_LIB(QAction, QtGui, qaction.h) -+QT_CLASS_LIB(QActionGroup, QtGui, qactiongroup.h) -+QT_CLASS_LIB(QApplication, QtGui, qapplication.h) -+QT_CLASS_LIB(QBoxLayout, QtGui, qboxlayout.h) -+QT_CLASS_LIB(QHBoxLayout, QtGui, qboxlayout.h) -+QT_CLASS_LIB(QVBoxLayout, QtGui, qboxlayout.h) -+QT_CLASS_LIB(QClipboard, QtGui, qclipboard.h) -+QT_CLASS_LIB(QCursor, QtGui, qcursor.h) -+QT_CLASS_LIB(QCursor, QtGui, qcursor.h) -+QT_CLASS_LIB(QCursorShape, QtGui, qcursor.h) -+QT_CLASS_LIB(QDesktopWidget, QtGui, qdesktopwidget.h) -+QT_CLASS_LIB(QDrag, QtGui, qdrag.h) -+QT_CLASS_LIB(QtEvents, QtGui, qevent.h) -+QT_CLASS_LIB(QInputEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QMouseEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QHoverEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QWheelEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QTabletEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QKeyEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QFocusEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QPaintEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QUpdateLaterEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QMoveEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QResizeEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QCloseEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QIconDragEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QShowEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QHideEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QContextMenuEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QInputMethodEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QDropEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QDragMoveEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QDragEnterEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QDragResponseEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QDragLeaveEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QHelpEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QStatusTipEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QWhatsThisClickedEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QActionEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QFileOpenEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QToolBarChangeEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QShortcutEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QClipboardEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QWindowStateChangeEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QMenubarUpdatedEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QTouchEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QGestureEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QScrollPrepareEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QScrollEvent, QtGui, qevent.h) -+QT_CLASS_LIB(QFormLayout, QtGui, qformlayout.h) -+QT_CLASS_LIB(QGenericPluginFactoryInterface, QtGui, qgenericplugin_qpa.h) -+QT_CLASS_LIB(QGenericPlugin, QtGui, qgenericplugin_qpa.h) -+QT_CLASS_LIB(QGenericPluginFactory, QtGui, qgenericpluginfactory_qpa.h) -+QT_CLASS_LIB(QGesture, QtGui, qgesture.h) -+QT_CLASS_LIB(QPanGesture, QtGui, qgesture.h) -+QT_CLASS_LIB(QPinchGesture, QtGui, qgesture.h) -+QT_CLASS_LIB(QSwipeGesture, QtGui, qgesture.h) -+QT_CLASS_LIB(QTapGesture, QtGui, qgesture.h) -+QT_CLASS_LIB(QTapAndHoldGesture, QtGui, qgesture.h) -+QT_CLASS_LIB(QGestureRecognizer, QtGui, qgesturerecognizer.h) -+QT_CLASS_LIB(QGridLayout, QtGui, qgridlayout.h) -+QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h) -+QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h) -+QT_CLASS_LIB(QLayoutIterator, QtGui, qlayout.h) -+QT_CLASS_LIB(QLayout, QtGui, qlayout.h) -+QT_CLASS_LIB(QLayoutItem, QtGui, qlayoutitem.h) -+QT_CLASS_LIB(QSpacerItem, QtGui, qlayoutitem.h) -+QT_CLASS_LIB(QWidgetItem, QtGui, qlayoutitem.h) -+QT_CLASS_LIB(QWidgetItemV2, QtGui, qlayoutitem.h) -+QT_CLASS_LIB(QMimeSource, QtGui, qmime.h) -+QT_CLASS_LIB(QWindowsMime, QtGui, qmime.h) -+QT_CLASS_LIB(QMacMime, QtGui, qmime.h) -+QT_CLASS_LIB(QMacPasteboardMime, QtGui, qmime.h) -+QT_CLASS_LIB(QPalette, QtGui, qpalette.h) -+QT_CLASS_LIB(QColorGroup, QtGui, qpalette.h) -+QT_CLASS_LIB(QPlatformCursorImage, QtGui, qplatformcursor_qpa.h) -+QT_CLASS_LIB(QPlatformCursorPrivate, QtGui, qplatformcursor_qpa.h) -+QT_CLASS_LIB(QPlatformCursor, QtGui, qplatformcursor_qpa.h) -+QT_CLASS_LIB(QPlatformEventLoopIntegration, QtGui, qplatformeventloopintegration_qpa.h) -+QT_CLASS_LIB(QPlatformGLContext, QtGui, qplatformglcontext_qpa.h) -+QT_CLASS_LIB(QPlatformIntegration, QtGui, qplatformintegration_qpa.h) -+QT_CLASS_LIB(QPlatformIntegrationFactoryInterface, QtGui, qplatformintegrationplugin_qpa.h) -+QT_CLASS_LIB(QPlatformIntegrationPlugin, QtGui, qplatformintegrationplugin_qpa.h) -+QT_CLASS_LIB(QPlatformScreen, QtGui, qplatformscreen_qpa.h) -+QT_CLASS_LIB(QPlatformWindow, QtGui, qplatformwindow_qpa.h) -+QT_CLASS_LIB(QPlatformWindowFormat, QtGui, qplatformwindowformat_qpa.h) -+QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h) -+QT_CLASS_LIB(QShortcut, QtGui, qshortcut.h) -+QT_CLASS_LIB(QSizePolicy, QtGui, qsizepolicy.h) -+QT_CLASS_LIB(QSound, QtGui, qsound.h) -+QT_CLASS_LIB(QStackedLayout, QtGui, qstackedlayout.h) -+QT_CLASS_LIB(QToolTip, QtGui, qtooltip.h) -+QT_CLASS_LIB(QWhatsThis, QtGui, qwhatsthis.h) -+QT_CLASS_LIB(QWidgetData, QtGui, qwidget.h) -+QT_CLASS_LIB(QWidget, QtGui, qwidget.h) -+QT_CLASS_LIB(QWidgetAction, QtGui, qwidgetaction.h) -+QT_CLASS_LIB(QWidgetList, QtGui, qwindowdefs.h) -+QT_CLASS_LIB(QWidgetMapper, QtGui, qwindowdefs.h) -+QT_CLASS_LIB(QWidgetSet, QtGui, qwindowdefs.h) -+QT_CLASS_LIB(QWindowSystemInterface, QtGui, qwindowsysteminterface_qpa.h) -+QT_CLASS_LIB(QX11EmbedWidget, QtGui, qx11embed_x11.h) -+QT_CLASS_LIB(QX11EmbedContainer, QtGui, qx11embed_x11.h) -+QT_CLASS_LIB(QX11Info, QtGui, qx11info_x11.h) -+QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h) -+QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h) -+QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h) -+QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h) -+QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h) -+QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h) -+QT_CLASS_LIB(QBrush, QtGui, qbrush.h) -+QT_CLASS_LIB(QBrushData, QtGui, qbrush.h) -+QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h) -+QT_CLASS_LIB(QGradientStops, QtGui, qbrush.h) -+QT_CLASS_LIB(QGradient, QtGui, qbrush.h) -+QT_CLASS_LIB(QLinearGradient, QtGui, qbrush.h) -+QT_CLASS_LIB(QRadialGradient, QtGui, qbrush.h) -+QT_CLASS_LIB(QConicalGradient, QtGui, qbrush.h) -+QT_CLASS_LIB(QColor, QtGui, qcolor.h) -+QT_CLASS_LIB(QColormap, QtGui, qcolormap.h) -+QT_CLASS_LIB(QTileRules, QtGui, qdrawutil.h) -+QT_CLASS_LIB(QMatrix, QtGui, qmatrix.h) -+QT_CLASS_LIB(QPaintDevice, QtGui, qpaintdevice.h) -+QT_CLASS_LIB(QTextItem, QtGui, qpaintengine.h) -+QT_CLASS_LIB(QPaintEngine, QtGui, qpaintengine.h) -+QT_CLASS_LIB(QPaintEngineState, QtGui, qpaintengine.h) -+QT_CLASS_LIB(QPainter, QtGui, qpainter.h) -+QT_CLASS_LIB(QPainterPath, QtGui, qpainterpath.h) -+QT_CLASS_LIB(QPainterPathPrivate, QtGui, qpainterpath.h) -+QT_CLASS_LIB(QPainterPathStroker, QtGui, qpainterpath.h) -+QT_CLASS_LIB(QPen, QtGui, qpen.h) -+QT_CLASS_LIB(QPolygon, QtGui, qpolygon.h) -+QT_CLASS_LIB(QPolygonF, QtGui, qpolygon.h) -+QT_CLASS_LIB(QPrintEngine, QtGui, qprintengine.h) -+QT_CLASS_LIB(QPrinter, QtGui, qprinter.h) -+QT_CLASS_LIB(QPrinterInfo, QtGui, qprinterinfo.h) -+QT_CLASS_LIB(QRegion, QtGui, qregion.h) -+QT_CLASS_LIB(QRgb, QtGui, qrgb.h) -+QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h) -+QT_CLASS_LIB(QTransform, QtGui, qtransform.h) -+QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h) -+QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h) -+QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h) -+QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h) -+QT_CLASS_LIB(QS60MainAppUiBase, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60StubAknAppUiBase, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60StubMEikStatusPaneObserver, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60StubMAknTouchPaneObserver, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60StubAknAppUi, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60MainAppUiBase, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h) -+QT_CLASS_LIB(QS60MainDocumentBase, QtGui, qs60maindocument.h) -+QT_CLASS_LIB(QS60MainDocumentBase, QtGui, qs60maindocument.h) -+QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h) -+QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h) -+QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h) -+QT_CLASS_LIB(QCDEStyle, QtGui, qcdestyle.h) -+QT_CLASS_LIB(QCleanlooksStyle, QtGui, qcleanlooksstyle.h) -+QT_CLASS_LIB(QCommonStyle, QtGui, qcommonstyle.h) -+QT_CLASS_LIB(QGtkStyle, QtGui, qgtkstyle.h) -+QT_CLASS_LIB(QMacStyle, QtGui, qmacstyle_mac.h) -+QT_CLASS_LIB(QMotifStyle, QtGui, qmotifstyle.h) -+QT_CLASS_LIB(QPlastiqueStyle, QtGui, qplastiquestyle.h) -+QT_CLASS_LIB(QProxyStyle, QtGui, qproxystyle.h) -+QT_CLASS_LIB(QS60Style, QtGui, qs60style.h) -+QT_CLASS_LIB(QStyle, QtGui, qstyle.h) -+QT_CLASS_LIB(QStyleFactory, QtGui, qstylefactory.h) -+QT_CLASS_LIB(QStyleOption, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionFocusRect, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionFrame, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionFrameV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionFrameV3, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTabWidgetFrame, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTabWidgetFrameV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTabBarBase, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTabBarBaseV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionHeader, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionButton, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTab, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTabV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTabV3, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionToolBar, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionProgressBar, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionProgressBarV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionMenuItem, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionQ3ListViewItem, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionQ3DockWindow, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionDockWidget, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionDockWidgetV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionViewItem, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionViewItemV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionViewItemV3, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionViewItemV4, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionToolBox, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionToolBoxV2, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionRubberBand, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionComplex, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionSlider, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionSpinBox, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionQ3ListView, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionToolButton, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionComboBox, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionTitleBar, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionGroupBox, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionSizeGrip, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleOptionGraphicsItem, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleHintReturn, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleHintReturnMask, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleHintReturnVariant, QtGui, qstyleoption.h) -+QT_CLASS_LIB(QStyleFactoryInterface, QtGui, qstyleplugin.h) -+QT_CLASS_LIB(QStylePlugin, QtGui, qstyleplugin.h) -+QT_CLASS_LIB(QWindowsCEStyle, QtGui, qwindowscestyle.h) -+QT_CLASS_LIB(QWindowsMobileStyle, QtGui, qwindowsmobilestyle.h) -+QT_CLASS_LIB(QWindowsStyle, QtGui, qwindowsstyle.h) -+QT_CLASS_LIB(QWindowsVistaStyle, QtGui, qwindowsvistastyle.h) -+QT_CLASS_LIB(QWindowsXPStyle, QtGui, qwindowsxpstyle.h) -+QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h) -+QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h) -+QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h) -+QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h) -+QT_CLASS_LIB(QAbstractFontEngine, QtGui, qabstractfontengine_qws.h) -+QT_CLASS_LIB(QAbstractTextDocumentLayout, QtGui, qabstracttextdocumentlayout.h) -+QT_CLASS_LIB(QTextObjectInterface, QtGui, qabstracttextdocumentlayout.h) -+QT_CLASS_LIB(QFont, QtGui, qfont.h) -+QT_CLASS_LIB(QFontDatabase, QtGui, qfontdatabase.h) -+QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h) -+QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h) -+QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h) -+QT_CLASS_LIB(QGlyphs, QtGui, qglyphs.h) -+QT_CLASS_LIB(QSupportedWritingSystems, QtGui, qplatformfontdatabase_qpa.h) -+QT_CLASS_LIB(QPlatformFontDatabase, QtGui, qplatformfontdatabase_qpa.h) -+QT_CLASS_LIB(QStaticText, QtGui, qstatictext.h) -+QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h) -+QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h) -+QT_CLASS_LIB(QAbstractUndoItem, QtGui, qtextdocument.h) -+QT_CLASS_LIB(QTextDocument, QtGui, qtextdocument.h) -+QT_CLASS_LIB(QTextDocumentFragment, QtGui, qtextdocumentfragment.h) -+QT_CLASS_LIB(QTextDocumentWriter, QtGui, qtextdocumentwriter.h) -+QT_CLASS_LIB(QTextLength, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextCharFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextBlockFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextListFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextImageFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextFrameFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextTableFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextTableCellFormat, QtGui, qtextformat.h) -+QT_CLASS_LIB(QTextInlineObject, QtGui, qtextlayout.h) -+QT_CLASS_LIB(QTextLayout, QtGui, qtextlayout.h) -+QT_CLASS_LIB(QTextLine, QtGui, qtextlayout.h) -+QT_CLASS_LIB(QTextList, QtGui, qtextlist.h) -+QT_CLASS_LIB(QTextObject, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextBlockGroup, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextFrameLayoutData, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextFrame, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextBlockUserData, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextBlock, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextFragment, QtGui, qtextobject.h) -+QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h) -+QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h) -+QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h) -+QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h) -+QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h) -+QT_CLASS_LIB(QScroller, QtGui, qscroller.h) -+QT_CLASS_LIB(QScrollerProperties, QtGui, qscrollerproperties.h) -+QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h) -+QT_CLASS_LIB(QUndoGroup, QtGui, qundogroup.h) -+QT_CLASS_LIB(QUndoCommand, QtGui, qundostack.h) -+QT_CLASS_LIB(QUndoStack, QtGui, qundostack.h) -+QT_CLASS_LIB(QUndoView, QtGui, qundoview.h) -+QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h) -+QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h) -+QT_CLASS_LIB(QAbstractSlider, QtGui, qabstractslider.h) -+QT_CLASS_LIB(QAbstractSpinBox, QtGui, qabstractspinbox.h) -+QT_CLASS_LIB(QButtonGroup, QtGui, qbuttongroup.h) -+QT_CLASS_LIB(QCalendarWidget, QtGui, qcalendarwidget.h) -+QT_CLASS_LIB(QCheckBox, QtGui, qcheckbox.h) -+QT_CLASS_LIB(QComboBox, QtGui, qcombobox.h) -+QT_CLASS_LIB(QCommandLinkButton, QtGui, qcommandlinkbutton.h) -+QT_CLASS_LIB(QDateTimeEdit, QtGui, qdatetimeedit.h) -+QT_CLASS_LIB(QTimeEdit, QtGui, qdatetimeedit.h) -+QT_CLASS_LIB(QDateEdit, QtGui, qdatetimeedit.h) -+QT_CLASS_LIB(QDial, QtGui, qdial.h) -+QT_CLASS_LIB(QDialogButtonBox, QtGui, qdialogbuttonbox.h) -+QT_CLASS_LIB(QDockWidget, QtGui, qdockwidget.h) -+QT_CLASS_LIB(QFocusFrame, QtGui, qfocusframe.h) -+QT_CLASS_LIB(QFontComboBox, QtGui, qfontcombobox.h) -+QT_CLASS_LIB(QFrame, QtGui, qframe.h) -+QT_CLASS_LIB(QGroupBox, QtGui, qgroupbox.h) -+QT_CLASS_LIB(QLabel, QtGui, qlabel.h) -+QT_CLASS_LIB(QLCDNumber, QtGui, qlcdnumber.h) -+QT_CLASS_LIB(QLineEdit, QtGui, qlineedit.h) -+QT_CLASS_LIB(QMacCocoaViewContainer, QtGui, qmaccocoaviewcontainer_mac.h) -+QT_CLASS_LIB(QMacNativeWidget, QtGui, qmacnativewidget_mac.h) -+QT_CLASS_LIB(QMainWindow, QtGui, qmainwindow.h) -+QT_CLASS_LIB(QMdiArea, QtGui, qmdiarea.h) -+QT_CLASS_LIB(QMdiSubWindow, QtGui, qmdisubwindow.h) -+QT_CLASS_LIB(QMenu, QtGui, qmenu.h) -+QT_CLASS_LIB(QMenuBar, QtGui, qmenubar.h) -+QT_CLASS_LIB(QMenuItem, QtGui, qmenudata.h) -+QT_CLASS_LIB(QPlainTextEdit, QtGui, qplaintextedit.h) -+QT_CLASS_LIB(QPlainTextDocumentLayout, QtGui, qplaintextedit.h) -+QT_CLASS_LIB(QPrintPreviewWidget, QtGui, qprintpreviewwidget.h) -+QT_CLASS_LIB(QProgressBar, QtGui, qprogressbar.h) -+QT_CLASS_LIB(QPushButton, QtGui, qpushbutton.h) -+QT_CLASS_LIB(QRadioButton, QtGui, qradiobutton.h) -+QT_CLASS_LIB(QRubberBand, QtGui, qrubberband.h) -+QT_CLASS_LIB(QScrollArea, QtGui, qscrollarea.h) -+QT_CLASS_LIB(QScrollBar, QtGui, qscrollbar.h) -+QT_CLASS_LIB(QSizeGrip, QtGui, qsizegrip.h) -+QT_CLASS_LIB(QSlider, QtGui, qslider.h) -+QT_CLASS_LIB(QSpinBox, QtGui, qspinbox.h) -+QT_CLASS_LIB(QDoubleSpinBox, QtGui, qspinbox.h) -+QT_CLASS_LIB(QSplashScreen, QtGui, qsplashscreen.h) -+QT_CLASS_LIB(QSplitter, QtGui, qsplitter.h) -+QT_CLASS_LIB(QSplitterHandle, QtGui, qsplitter.h) -+QT_CLASS_LIB(QStackedWidget, QtGui, qstackedwidget.h) -+QT_CLASS_LIB(QStatusBar, QtGui, qstatusbar.h) -+QT_CLASS_LIB(QTabBar, QtGui, qtabbar.h) -+QT_CLASS_LIB(QTabWidget, QtGui, qtabwidget.h) -+QT_CLASS_LIB(QTextBrowser, QtGui, qtextbrowser.h) -+QT_CLASS_LIB(QTextEdit, QtGui, qtextedit.h) -+QT_CLASS_LIB(QToolBar, QtGui, qtoolbar.h) -+QT_CLASS_LIB(QToolBox, QtGui, qtoolbox.h) -+QT_CLASS_LIB(QToolButton, QtGui, qtoolbutton.h) -+QT_CLASS_LIB(QValidator, QtGui, qvalidator.h) -+QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h) -+QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h) -+QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h) -+QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h) -+QT_CLASS_LIB(QScriptEngineDebugger, QtScriptTools, qscriptenginedebugger.h) -+QT_CLASS_LIB(QUiLoader, QtUiTools, quiloader.h) -+QT_CLASS_LIB(QDesignerComponents, QtDesigner, qdesigner_components.h) -+QT_CLASS_LIB(QExtensionFactory, QtDesigner, default_extensionfactory.h) -+QT_CLASS_LIB(QAbstractExtensionFactory, QtDesigner, extension.h) -+QT_CLASS_LIB(QAbstractExtensionManager, QtDesigner, extension.h) -+QT_CLASS_LIB(QExtensionManager, QtDesigner, qextensionmanager.h) -+QT_CLASS_LIB(QDesignerActionEditorInterface, QtDesigner, abstractactioneditor.h) -+QT_CLASS_LIB(QDesignerBrushManagerInterface, QtDesigner, abstractbrushmanager.h) -+QT_CLASS_LIB(QDesignerDnDItemInterface, QtDesigner, abstractdnditem.h) -+QT_CLASS_LIB(QDesignerFormEditorInterface, QtDesigner, abstractformeditor.h) -+QT_CLASS_LIB(QDesignerFormEditorPluginInterface, QtDesigner, abstractformeditorplugin.h) -+QT_CLASS_LIB(QDesignerFormWindowInterface, QtDesigner, abstractformwindow.h) -+QT_CLASS_LIB(QDesignerFormWindowCursorInterface, QtDesigner, abstractformwindowcursor.h) -+QT_CLASS_LIB(QDesignerFormWindowManagerInterface, QtDesigner, abstractformwindowmanager.h) -+QT_CLASS_LIB(QDesignerFormWindowToolInterface, QtDesigner, abstractformwindowtool.h) -+QT_CLASS_LIB(QDesignerIconCacheInterface, QtDesigner, abstracticoncache.h) -+QT_CLASS_LIB(QDesignerIntegrationInterface, QtDesigner, abstractintegration.h) -+QT_CLASS_LIB(QDesignerLanguageExtension, QtDesigner, abstractlanguage.h) -+QT_CLASS_LIB(QDesignerMetaDataBaseItemInterface, QtDesigner, abstractmetadatabase.h) -+QT_CLASS_LIB(QDesignerMetaDataBaseInterface, QtDesigner, abstractmetadatabase.h) -+QT_CLASS_LIB(QDesignerObjectInspectorInterface, QtDesigner, abstractobjectinspector.h) -+QT_CLASS_LIB(QDesignerPromotionInterface, QtDesigner, abstractpromotioninterface.h) -+QT_CLASS_LIB(QDesignerPropertyEditorInterface, QtDesigner, abstractpropertyeditor.h) -+QT_CLASS_LIB(QDesignerResourceBrowserInterface, QtDesigner, abstractresourcebrowser.h) -+QT_CLASS_LIB(QDesignerWidgetBoxInterface, QtDesigner, abstractwidgetbox.h) -+QT_CLASS_LIB(QDesignerWidgetDataBaseItemInterface, QtDesigner, abstractwidgetdatabase.h) -+QT_CLASS_LIB(QDesignerWidgetDataBaseInterface, QtDesigner, abstractwidgetdatabase.h) -+QT_CLASS_LIB(QDesignerWidgetFactoryInterface, QtDesigner, abstractwidgetfactory.h) -+QT_CLASS_LIB(QDesignerDynamicPropertySheetExtension, QtDesigner, dynamicpropertysheet.h) -+QT_CLASS_LIB(QDesignerExtraInfoExtension, QtDesigner, extrainfo.h) -+QT_CLASS_LIB(QDesignerLayoutDecorationExtension, QtDesigner, layoutdecoration.h) -+QT_CLASS_LIB(QDesignerMemberSheetExtension, QtDesigner, membersheet.h) -+QT_CLASS_LIB(QDesignerPropertySheetExtension, QtDesigner, propertysheet.h) -+QT_CLASS_LIB(QDesignerTaskMenuExtension, QtDesigner, taskmenu.h) -+QT_CLASS_LIB(QAbstractFormBuilder, QtDesigner, abstractformbuilder.h) -+QT_CLASS_LIB(QDesignerContainerExtension, QtDesigner, container.h) -+QT_CLASS_LIB(QDesignerCustomWidgetInterface, QtDesigner, customwidget.h) -+QT_CLASS_LIB(QDesignerCustomWidgetCollectionInterface, QtDesigner, customwidget.h) -+QT_CLASS_LIB(QFormBuilder, QtDesigner, formbuilder.h) -+QT_CLASS_LIB(QDesignerExportWidget, QtDesigner, qdesignerexportwidget.h) -+QT_CLASS_LIB(Phonon::AbstractAudioOutput, phonon, abstractaudiooutput.h) -+QT_CLASS_LIB(Phonon::AbstractMediaStream, phonon, abstractmediastream.h) -+QT_CLASS_LIB(Phonon::AbstractVideoOutput, phonon, abstractvideooutput.h) -+QT_CLASS_LIB(Phonon::AddonInterface, phonon, addoninterface.h) -+QT_CLASS_LIB(Phonon::AudioDataOutput, phonon, audiodataoutput.h) -+QT_CLASS_LIB(Phonon::AudioDataOutputInterface, phonon, audiodataoutputinterface.h) -+QT_CLASS_LIB(Phonon::AudioOutput, phonon, audiooutput.h) -+QT_CLASS_LIB(Phonon::AudioOutputInterface40, phonon, audiooutputinterface.h) -+QT_CLASS_LIB(Phonon::AudioOutputInterface42, phonon, audiooutputinterface.h) -+QT_CLASS_LIB(Phonon::AudioOutputInterface, phonon, audiooutputinterface.h) -+QT_CLASS_LIB(Phonon::AudioOutputInterface, phonon, audiooutputinterface.h) -+QT_CLASS_LIB(Phonon::BackendCapabilities, phonon, backendcapabilities.h) -+QT_CLASS_LIB(Phonon::BackendInterface, phonon, backendinterface.h) -+QT_CLASS_LIB(Phonon::Effect, phonon, effect.h) -+QT_CLASS_LIB(Phonon::EffectInterface, phonon, effectinterface.h) -+QT_CLASS_LIB(Phonon::EffectParameter, phonon, effectparameter.h) -+QT_CLASS_LIB(Phonon::EffectWidget, phonon, effectwidget.h) -+QT_CLASS_LIB(Phonon::GlobalConfig, phonon, globalconfig.h) -+QT_CLASS_LIB(Phonon::MediaController, phonon, mediacontroller.h) -+QT_CLASS_LIB(Phonon::MediaNode, phonon, medianode.h) -+QT_CLASS_LIB(Phonon::MediaObject, phonon, mediaobject.h) -+QT_CLASS_LIB(Phonon::MediaObjectInterface, phonon, mediaobjectinterface.h) -+QT_CLASS_LIB(Phonon::MediaSource, phonon, mediasource.h) -+QT_CLASS_LIB(Phonon::ObjectDescriptionData, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::ObjectDescription, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::AudioOutputDevice, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::AudioCaptureDevice, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::EffectDescription, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::AudioChannelDescription, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::SubtitleDescription, phonon, objectdescription.h) -+QT_CLASS_LIB(Phonon::ObjectDescriptionModelData, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::ObjectDescriptionModel, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::AudioOutputDeviceModel, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::AudioCaptureDeviceModel, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::EffectDescriptionModel, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::AudioChannelDescriptionModel, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::SubtitleDescriptionModel, phonon, objectdescriptionmodel.h) -+QT_CLASS_LIB(Phonon::Path, phonon, path.h) -+QT_CLASS_LIB(Phonon::Global, phonon, phononnamespace.h) -+QT_CLASS_LIB(Phonon::PlatformPlugin, phonon, platformplugin.h) -+QT_CLASS_LIB(Phonon::PulseSupport, phonon, pulsesupport.h) -+QT_CLASS_LIB(Phonon::SeekSlider, phonon, seekslider.h) -+QT_CLASS_LIB(Phonon::StreamInterface, phonon, streaminterface.h) -+QT_CLASS_LIB(Phonon::VideoPlayer, phonon, videoplayer.h) -+QT_CLASS_LIB(Phonon::VideoWidget, phonon, videowidget.h) -+QT_CLASS_LIB(Phonon::VideoWidgetInterface, phonon, videowidgetinterface.h) -+QT_CLASS_LIB(Phonon::VideoWidgetInterface44, phonon, videowidgetinterface.h) -+QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h) -+QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h) -+QT_CLASS_LIB(Phonon::VolumeFaderEffect, phonon, volumefadereffect.h) -+QT_CLASS_LIB(Phonon::VolumeFaderInterface, phonon, volumefaderinterface.h) -+QT_CLASS_LIB(Phonon::VolumeSlider, phonon, volumeslider.h) -+QT_CLASS_LIB(QGraphicsSvgItem, QtSvg, qgraphicssvgitem.h) -+QT_CLASS_LIB(QSvgGenerator, QtSvg, qsvggenerator.h) -+QT_CLASS_LIB(QSvgRenderer, QtSvg, qsvgrenderer.h) -+QT_CLASS_LIB(QSvgWidget, QtSvg, qsvgwidget.h) -+QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h) -+QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h) -+QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h) -+QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h) -+QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h) -+QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h) -+QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h) -+QT_CLASS_LIB(Q3IconDragItem, Qt3Support, q3iconview.h) -+QT_CLASS_LIB(Q3IconDrag, Qt3Support, q3iconview.h) -+QT_CLASS_LIB(Q3IconViewItem, Qt3Support, q3iconview.h) -+QT_CLASS_LIB(Q3IconView, Qt3Support, q3iconview.h) -+QT_CLASS_LIB(Q3ListBox, Qt3Support, q3listbox.h) -+QT_CLASS_LIB(Q3ListBoxItem, Qt3Support, q3listbox.h) -+QT_CLASS_LIB(Q3ListBoxText, Qt3Support, q3listbox.h) -+QT_CLASS_LIB(Q3ListBoxPixmap, Qt3Support, q3listbox.h) -+QT_CLASS_LIB(Q3ListViewItem, Qt3Support, q3listview.h) -+QT_CLASS_LIB(Q3ListView, Qt3Support, q3listview.h) -+QT_CLASS_LIB(Q3CheckListItem, Qt3Support, q3listview.h) -+QT_CLASS_LIB(Q3ListViewItemIterator, Qt3Support, q3listview.h) -+QT_CLASS_LIB(Q3TableSelection, Qt3Support, q3table.h) -+QT_CLASS_LIB(Q3TableItem, Qt3Support, q3table.h) -+QT_CLASS_LIB(Q3ComboTableItem, Qt3Support, q3table.h) -+QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h) -+QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h) -+QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h) -+QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h) -+QT_CLASS_LIB(Q3Ftp, Qt3Support, q3ftp.h) -+QT_CLASS_LIB(Q3HttpHeader, Qt3Support, q3http.h) -+QT_CLASS_LIB(Q3HttpResponseHeader, Qt3Support, q3http.h) -+QT_CLASS_LIB(Q3HttpRequestHeader, Qt3Support, q3http.h) -+QT_CLASS_LIB(Q3Http, Qt3Support, q3http.h) -+QT_CLASS_LIB(Q3LocalFs, Qt3Support, q3localfs.h) -+QT_CLASS_LIB(Q3NetworkProtocolFactoryBase, Qt3Support, q3networkprotocol.h) -+QT_CLASS_LIB(Q3NetworkProtocolFactory, Qt3Support, q3networkprotocol.h) -+QT_CLASS_LIB(Q3NetworkProtocolDict, Qt3Support, q3networkprotocol.h) -+QT_CLASS_LIB(Q3NetworkProtocol, Qt3Support, q3networkprotocol.h) -+QT_CLASS_LIB(Q3NetworkOperation, Qt3Support, q3networkprotocol.h) -+QT_CLASS_LIB(Q3ServerSocket, Qt3Support, q3serversocket.h) -+QT_CLASS_LIB(Q3Socket, Qt3Support, q3socket.h) -+QT_CLASS_LIB(Q3SocketDevice, Qt3Support, q3socketdevice.h) -+QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h) -+QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h) -+QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h) -+QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h) -+QT_CLASS_LIB(Q3HBoxLayout, Qt3Support, q3boxlayout.h) -+QT_CLASS_LIB(Q3VBoxLayout, Qt3Support, q3boxlayout.h) -+QT_CLASS_LIB(Q3DragObject, Qt3Support, q3dragobject.h) -+QT_CLASS_LIB(Q3StoredDrag, Qt3Support, q3dragobject.h) -+QT_CLASS_LIB(Q3TextDrag, Qt3Support, q3dragobject.h) -+QT_CLASS_LIB(Q3ImageDrag, Qt3Support, q3dragobject.h) -+QT_CLASS_LIB(Q3UriDrag, Qt3Support, q3dragobject.h) -+QT_CLASS_LIB(Q3ColorDrag, Qt3Support, q3dragobject.h) -+QT_CLASS_LIB(Q3DropSite, Qt3Support, q3dropsite.h) -+QT_CLASS_LIB(Q3GridLayout, Qt3Support, q3gridlayout.h) -+QT_CLASS_LIB(Q3MimeSourceFactory, Qt3Support, q3mimefactory.h) -+QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h) -+QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h) -+QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h) -+QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h) -+QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h) -+QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h) -+QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h) -+QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h) -+QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h) -+QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h) -+QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h) -+QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h) -+QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h) -+QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h) -+QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h) -+QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h) -+QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h) -+QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h) -+QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h) -+QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h) -+QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h) -+QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h) -+QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h) -+QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h) -+QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h) -+QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h) -+QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h) -+QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h) -+QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h) -+QT_CLASS_LIB(Q3AsciiCache, Qt3Support, q3asciicache.h) -+QT_CLASS_LIB(Q3AsciiCacheIterator, Qt3Support, q3asciicache.h) -+QT_CLASS_LIB(Q3AsciiDict, Qt3Support, q3asciidict.h) -+QT_CLASS_LIB(Q3AsciiDictIterator, Qt3Support, q3asciidict.h) -+QT_CLASS_LIB(Q3Cache, Qt3Support, q3cache.h) -+QT_CLASS_LIB(Q3CacheIterator, Qt3Support, q3cache.h) -+QT_CLASS_LIB(Q3CleanupHandler, Qt3Support, q3cleanuphandler.h) -+QT_CLASS_LIB(Q3SingleCleanupHandler, Qt3Support, q3cleanuphandler.h) -+QT_CLASS_LIB(Q3CString, Qt3Support, q3cstring.h) -+QT_CLASS_LIB(Q3DeepCopy, Qt3Support, q3deepcopy.h) -+QT_CLASS_LIB(Q3Dict, Qt3Support, q3dict.h) -+QT_CLASS_LIB(Q3DictIterator, Qt3Support, q3dict.h) -+QT_CLASS_LIB(Q3GArray, Qt3Support, q3garray.h) -+QT_CLASS_LIB(Q3GCache, Qt3Support, q3gcache.h) -+QT_CLASS_LIB(Q3GCacheIterator, Qt3Support, q3gcache.h) -+QT_CLASS_LIB(Q3BaseBucket, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3StringBucket, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3AsciiBucket, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3IntBucket, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3PtrBucket, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3GDict, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3GDictIterator, Qt3Support, q3gdict.h) -+QT_CLASS_LIB(Q3LNode, Qt3Support, q3glist.h) -+QT_CLASS_LIB(Q3GList, Qt3Support, q3glist.h) -+QT_CLASS_LIB(Q3GListIterator, Qt3Support, q3glist.h) -+QT_CLASS_LIB(Q3GListStdIterator, Qt3Support, q3glist.h) -+QT_CLASS_LIB(Q3GVector, Qt3Support, q3gvector.h) -+QT_CLASS_LIB(Q3IntCache, Qt3Support, q3intcache.h) -+QT_CLASS_LIB(Q3IntCacheIterator, Qt3Support, q3intcache.h) -+QT_CLASS_LIB(Q3IntDict, Qt3Support, q3intdict.h) -+QT_CLASS_LIB(Q3IntDictIterator, Qt3Support, q3intdict.h) -+QT_CLASS_LIB(Q3MemArray, Qt3Support, q3memarray.h) -+QT_CLASS_LIB(Q3ObjectDictionary, Qt3Support, q3objectdict.h) -+QT_CLASS_LIB(Q3PtrCollection, Qt3Support, q3ptrcollection.h) -+QT_CLASS_LIB(Q3PtrDict, Qt3Support, q3ptrdict.h) -+QT_CLASS_LIB(Q3PtrDictIterator, Qt3Support, q3ptrdict.h) -+QT_CLASS_LIB(Q3PtrListStdIterator, Qt3Support, q3ptrlist.h) -+QT_CLASS_LIB(Q3PtrList, Qt3Support, q3ptrlist.h) -+QT_CLASS_LIB(Q3PtrListIterator, Qt3Support, q3ptrlist.h) -+QT_CLASS_LIB(Q3PtrQueue, Qt3Support, q3ptrqueue.h) -+QT_CLASS_LIB(Q3PtrStack, Qt3Support, q3ptrstack.h) -+QT_CLASS_LIB(Q3PtrVector, Qt3Support, q3ptrvector.h) -+QT_CLASS_LIB(Q3Semaphore, Qt3Support, q3semaphore.h) -+QT_CLASS_LIB(Q3Shared, Qt3Support, q3shared.h) -+QT_CLASS_LIB(Q3Signal, Qt3Support, q3signal.h) -+QT_CLASS_LIB(Q3SortedList, Qt3Support, q3sortedlist.h) -+QT_CLASS_LIB(Q3StrListIterator, Qt3Support, q3strlist.h) -+QT_CLASS_LIB(Q3StrListIterator, Qt3Support, q3strlist.h) -+QT_CLASS_LIB(Q3StrList, Qt3Support, q3strlist.h) -+QT_CLASS_LIB(Q3StrIList, Qt3Support, q3strlist.h) -+QT_CLASS_LIB(Q3StrVec, Qt3Support, q3strvec.h) -+QT_CLASS_LIB(Q3StrIVec, Qt3Support, q3strvec.h) -+QT_CLASS_LIB(Q3ValueListIterator, Qt3Support, q3valuelist.h) -+QT_CLASS_LIB(Q3ValueListConstIterator, Qt3Support, q3valuelist.h) -+QT_CLASS_LIB(Q3ValueList, Qt3Support, q3valuelist.h) -+QT_CLASS_LIB(Q3ValueStack, Qt3Support, q3valuestack.h) -+QT_CLASS_LIB(Q3ValueVector, Qt3Support, q3valuevector.h) -+QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h) -+QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h) -+QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h) -+QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h) -+QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h) -+QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h) -+QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h) -+QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h) -+QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h) -+QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h) -+QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h) -+QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h) -+QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h) -+QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h) -+QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h) -+QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h) -+QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h) -+QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h) -+QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h) -+QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h) -+QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h) -+QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h) -+QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h) -+QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h) -+QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h) -+QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h) -+QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h) -+QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h) -+QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h) -+QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h) -+QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h) -+QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h) --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0030-Make-phonon-compile.patch b/patches/master/0030-Make-phonon-compile.patch deleted file mode 100644 index 6c8258d..0000000 --- a/patches/master/0030-Make-phonon-compile.patch +++ /dev/null @@ -1,245 +0,0 @@ -From a7edaadefe2df875c42bd3a87ce61db800abaf85 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Wed, 29 Dec 2010 07:55:52 +0100 -Subject: [PATCH] Make phonon compile - ---- - phonon/modules/qt_phonon.pri | 6 ++++++ - phonon/phonon.pro | 4 ++++ - phonon/src/phonon/phonon.pro | 7 +++++-- - phonon/src/plugins/phonon/ds9/ds9.pro | 6 ++++-- - phonon/src/plugins/phonon/gstreamer/gstreamer.pro | 6 ++++-- - phonon/src/plugins/phonon/mmf/mmf.pro | 8 +++++--- - phonon/src/plugins/phonon/qt7/qt7.pro | 6 ++++-- - phonon/src/plugins/phonon/waveout/waveout.pro | 6 ++++-- - phonon/src/plugins/plugins.pro | 3 +++ - phonon/src/src.pro | 4 ++++ - phonon/sync.profile | 15 +++++++++++++++ - 11 files changed, 58 insertions(+), 13 deletions(-) - create mode 100644 phonon/modules/qt_phonon.pri - create mode 100644 phonon/phonon.pro - create mode 100644 phonon/src/plugins/plugins.pro - create mode 100644 phonon/src/src.pro - create mode 100644 phonon/sync.profile - -diff --git a/phonon/modules/qt_phonon.pri b/phonon/modules/qt_phonon.pri -new file mode 100644 -index 0000000..ec7757d ---- /dev/null -+++ b/phonon/modules/qt_phonon.pri -@@ -0,0 +1,6 @@ -+QT.phonon.name = phonon -+QT.phonon.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/phonon -+QT.phonon.private_includes = $$QT_MODULE_INCLUDE_BASE/phonon/private -+QT.phonon.sources = $$QT_MODULE_BASE/src/3rdparty/phonon/phonon -+QT.phonon.libs = $$QT_MODULE_LIB_BASE -+QT.phonon.depends = core gui network -diff --git a/phonon/phonon.pro b/phonon/phonon.pro -new file mode 100644 -index 0000000..0da9087 ---- /dev/null -+++ b/phonon/phonon.pro -@@ -0,0 +1,4 @@ -+TEMPLATE = subdirs -+CONFIG += ordered -+SUBDIRS += src \ -+# examples \ -diff --git a/phonon/src/phonon/phonon.pro b/phonon/src/phonon/phonon.pro -index b16c5a1..9da6a25 100644 ---- a/phonon/src/phonon/phonon.pro -+++ b/phonon/src/phonon/phonon.pro -@@ -1,5 +1,8 @@ -+load(qt_module) -+ - TARGET = phonon --include(../qbase.pri) -+QPRO_PWD = $$PWD -+include($$QT_SOURCE_TREE/src/qbase.pri) - - PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION} - PHONON_MINOR_VERSION = 4 -@@ -9,7 +12,7 @@ VERSION = $${PHONON_MAJOR_VERSION}.$${PHONON_MINOR_VERSION}.$${PHONON_PATCH_VERS - DEPENDPATH += . - DEFINES += MAKE_PHONON_LIB - --PHONON_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/phonon -+PHONON_DIR = ../3rdparty/phonon/phonon - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork - -diff --git a/phonon/src/plugins/phonon/ds9/ds9.pro b/phonon/src/plugins/phonon/ds9/ds9.pro -index 301808e..4b6c0e7 100644 ---- a/phonon/src/plugins/phonon/ds9/ds9.pro -+++ b/phonon/src/plugins/phonon/ds9/ds9.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend - QT += phonon - win32:!wince*:contains(QT_CONFIG,opengl):LIBS += -lopengl32 -@@ -7,7 +9,7 @@ LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32 - TARGET = phonon_ds9 - - DEFINES += PHONON_MAKE_QT_ONLY_BACKEND --PHONON_DS9_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/ds9 -+PHONON_DS9_DIR = ../../../3rdparty/phonon/ds9 - - # Input - HEADERS += \ -@@ -63,4 +65,4 @@ wince*:HEADERS += $$PHONON_DS9_DIR/videorenderer_default.h - target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend - INSTALLS += target - --include(../../qpluginbase.pri) -+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -diff --git a/phonon/src/plugins/phonon/gstreamer/gstreamer.pro b/phonon/src/plugins/phonon/gstreamer/gstreamer.pro -index c0d2604..1df4a78 100644 ---- a/phonon/src/plugins/phonon/gstreamer/gstreamer.pro -+++ b/phonon/src/plugins/phonon/gstreamer/gstreamer.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = phonon_gstreamer - DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend - -@@ -11,7 +13,7 @@ contains(QT_CONFIG, opengl):QT += opengl - QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER - LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 -lgstaudio-0.10 - --PHONON_GSTREAMER_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer -+PHONON_GSTREAMER_DIR = ../../../3rdparty/phonon/gstreamer - - HEADERS += $$PHONON_GSTREAMER_DIR/common.h \ - $$PHONON_GSTREAMER_DIR/audiooutput.h \ -@@ -66,4 +68,4 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstractrenderer.cpp \ - target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend - INSTALLS += target - --include(../../qpluginbase.pri) -+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -diff --git a/phonon/src/plugins/phonon/mmf/mmf.pro b/phonon/src/plugins/phonon/mmf/mmf.pro -index 7c7c1d7..9bf50c7 100644 ---- a/phonon/src/plugins/phonon/mmf/mmf.pro -+++ b/phonon/src/plugins/phonon/mmf/mmf.pro -@@ -1,8 +1,10 @@ -+load(qt_module) -+ - # MMF Phonon backend - symbian { - QT += phonon - TARGET = phonon_mmf -- PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf -+ PHONON_MMF_DIR = ../../../3rdparty/phonon/mmf - - # Uncomment the following line in order to use the CDrmPlayerUtility client - # API for audio playback, rather than CMdaAudioPlayerUtility. -@@ -20,7 +22,7 @@ symbian { - # '#include <videoplayer.h>' picks up the Symbian header, as intended. - PREPEND_INCLUDEPATH = $${EPOCROOT}epoc32/include - -- PREPEND_INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty -+ PREPEND_INCLUDEPATH += ../../../3rdparty - - INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE - -@@ -140,7 +142,7 @@ symbian { - target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend - INSTALLS += target - -- include(../../qpluginbase.pri) -+ include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) - - TARGET.UID3=0x2001E629 - } -diff --git a/phonon/src/plugins/phonon/qt7/qt7.pro b/phonon/src/plugins/phonon/qt7/qt7.pro -index 53407db..d00ba88 100644 ---- a/phonon/src/plugins/phonon/qt7/qt7.pro -+++ b/phonon/src/plugins/phonon/qt7/qt7.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - QT += opengl phonon - TARGET = phonon_qt7 - DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend -@@ -19,7 +21,7 @@ LIBS += -framework AppKit -framework AudioUnit \ - DEPENDPATH += . - INCLUDEPATH += . - --PHONON_QUICKTIME_DIR=$$QT_SOURCE_TREE/src/3rdparty/phonon/qt7 -+PHONON_QUICKTIME_DIR=../../../3rdparty/phonon/qt7 - - # Input - HEADERS += $$PHONON_QUICKTIME_DIR/medianode.h \ -@@ -73,4 +75,4 @@ OBJECTIVE_SOURCES += $$PHONON_QUICKTIME_DIR/quicktimevideoplayer.mm \ - target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend - INSTALLS += target - --include(../../qpluginbase.pri) -+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -diff --git a/phonon/src/plugins/phonon/waveout/waveout.pro b/phonon/src/plugins/phonon/waveout/waveout.pro -index 1e2bd33..4816b66 100644 ---- a/phonon/src/plugins/phonon/waveout/waveout.pro -+++ b/phonon/src/plugins/phonon/waveout/waveout.pro -@@ -1,10 +1,12 @@ -+load(qt_module) -+ - DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend - QT += phonon - win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS - TARGET = phonon_waveout - - DEFINES += PHONON_MAKE_QT_ONLY_BACKEND --PHONON_WAVEOUT_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/waveout -+PHONON_WAVEOUT_DIR = ../../../3rdparty/phonon/waveout - - # Input - HEADERS += $$PHONON_WAVEOUT_DIR/audiooutput.h \ -@@ -20,4 +22,4 @@ SOURCES += $$PHONON_WAVEOUT_DIR/audiooutput.cpp \ - target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend - INSTALLS += target - --include(../../qpluginbase.pri) -+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) -diff --git a/phonon/src/plugins/plugins.pro b/phonon/src/plugins/plugins.pro -new file mode 100644 -index 0000000..eb448e0 ---- /dev/null -+++ b/phonon/src/plugins/plugins.pro -@@ -0,0 +1,3 @@ -+TEMPLATE = subdirs -+CONFIG += ordered -+SUBDIRS += phonon \ -diff --git a/phonon/src/src.pro b/phonon/src/src.pro -new file mode 100644 -index 0000000..4109e26 ---- /dev/null -+++ b/phonon/src/src.pro -@@ -0,0 +1,4 @@ -+TEMPLATE = subdirs -+CONFIG += ordered -+SUBDIRS += phonon \ -+ plugins \ -diff --git a/phonon/sync.profile b/phonon/sync.profile -new file mode 100644 -index 0000000..ed54cb9 ---- /dev/null -+++ b/phonon/sync.profile -@@ -0,0 +1,15 @@ -+%modules = ( # path to module name map -+ "phonon" => "$basedir/src/3rdparty/phonon/phonon", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+); -+%mastercontent = ( -+ "core" => "#include <QtCore/QtCore>\n", -+ "gui" => "#include <QtGui/QtGui>\n", -+ "network" => "#include <QtNetwork/QtNetwork>\n", -+); -+%modulepris = ( -+ "phonon" => "$basedir/modules/qt_phonon.pri", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0033-Fixed-useless-substitution-in-syncqt.patch b/patches/master/0033-Fixed-useless-substitution-in-syncqt.patch deleted file mode 100644 index 8dda471..0000000 --- a/patches/master/0033-Fixed-useless-substitution-in-syncqt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bb2e4aa4a3817a890e20335511559e534eb2bc7c Mon Sep 17 00:00:00 2001 -From: axis <qt-info@nokia.com> -Date: Mon, 3 Jan 2011 19:18:14 +0100 -Subject: [PATCH] Fixed useless substitution in syncqt. - -The substitution is not necessary and messes up the argument that is -passed in. ---- - qtkernel/bin/syncqt | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 0894c80..5a72636 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -303,7 +303,6 @@ sub syncHeader { - ###################################################################### - sub fixPaths { - my ($file, $dir) = @_; -- $dir =~ s=^$quoted_basedir/=$out_basedir/= if(!($basedir eq $out_basedir)); - $file =~ s=\\=/=g; - $dir =~ s=\\=/=g; - --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch b/patches/master/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch deleted file mode 100644 index efb0a79..0000000 --- a/patches/master/0035-Made-the-internal-support-for-Qt3Support-in-QtGui-co.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 629ac41df49f85b7b703beb2a342ba7caef5ceb2 Mon Sep 17 00:00:00 2001 -From: axis <qt-info@nokia.com> -Date: Mon, 3 Jan 2011 22:54:07 +0100 -Subject: [PATCH 35/84] Made the internal support for Qt3Support in QtGui compile. - ---- - qtkernel/src/qbase.pri | 2 +- - qtkernel/src/tools/uic/uic.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index f8ababb..a875a56 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri -@@ -166,7 +166,7 @@ win32-g++* { - - contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE - DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS --contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT -+contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT - DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code - DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION - -diff --git a/qtkernel/src/tools/uic/uic.pro b/qtkernel/src/tools/uic/uic.pro -index 9b63d42..591925c 100644 ---- a/qtkernel/src/tools/uic/uic.pro -+++ b/qtkernel/src/tools/uic/uic.pro -@@ -6,7 +6,7 @@ DEFINES += QT_UIC - INCLUDEPATH += . - DEPENDPATH += . - --!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT -+!contains(QT_CONFIG, gui-qt3support):DEFINES += QT_NO_QT3_SUPPORT - - include(uic.pri) - include(cpp/cpp.pri) --- -1.7.2.2 - diff --git a/patches/master/0037-Make-each-module-refer-to-its-own-bin.patch b/patches/master/0037-Make-each-module-refer-to-its-own-bin.patch deleted file mode 100644 index a4eacc9..0000000 --- a/patches/master/0037-Make-each-module-refer-to-its-own-bin.patch +++ /dev/null @@ -1,308 +0,0 @@ -From d471a1a923941bf623ea6f966c7850c1a77be17f Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Thu, 6 Jan 2011 12:52:17 -0600 -Subject: [PATCH] Make each module refer to its own bin/ - -Since modules cannot rely on QtCore having a build directory, nor -can they build the applications directly into $$[QT_INSTALL_BINS] -each module needs their own bin/. Add this path to each module's -pri file, so others can use their applications ---- - phonon/modules/qt_phonon.pri | 1 + - qt3support/modules/qt_qt3support.pri | 1 + - qtkernel/bin/syncqt | 1 + - qtkernel/mkspecs/features/qt_config.prf | 1 + - qtkernel/mkspecs/features/qt_functions.prf | 9 ++++++--- - qtkernel/src/modules/qt_core.pri | 1 + - qtkernel/src/modules/qt_dbus.pri | 1 + - qtkernel/src/modules/qt_network.pri | 1 + - qtkernel/src/modules/qt_opengl.pri | 1 + - qtkernel/src/modules/qt_openvg.pri | 1 + - qtkernel/src/modules/qt_sql.pri | 1 + - qtkernel/src/modules/qt_testlib.pri | 1 + - qtkernel/src/modules/qt_xml.pri | 1 + - qtquick/modules/qt_declarative.pri | 1 + - qtscript/modules/qt_script.pri | 1 + - qtscript/modules/qt_scripttools.pri | 1 + - qtsvg/modules/qt_svg.pri | 1 + - qttools/modules/qt_clucene.pri | 1 + - qttools/modules/qt_designer.pri | 1 + - qttools/modules/qt_help.pri | 1 + - qttools/modules/qt_uitools.pri | 1 + - qtxmlpatterns/modules/qt_xmlpatterns.pri | 1 + - 22 files changed, 27 insertions(+), 3 deletions(-) - -diff --git a/phonon/modules/qt_phonon.pri b/phonon/modules/qt_phonon.pri -index ec7757d..6311190 100644 ---- a/phonon/modules/qt_phonon.pri -+++ b/phonon/modules/qt_phonon.pri -@@ -1,4 +1,5 @@ - QT.phonon.name = phonon -+QT.phonon.bins = $$QT_MODULE_BIN_BASE - QT.phonon.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/phonon - QT.phonon.private_includes = $$QT_MODULE_INCLUDE_BASE/phonon/private - QT.phonon.sources = $$QT_MODULE_BASE/src/3rdparty/phonon/phonon -diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri -index 06754db..e2526f8 100644 ---- a/qt3support/modules/qt_qt3support.pri -+++ b/qt3support/modules/qt_qt3support.pri -@@ -4,6 +4,7 @@ QT_QT3SUPPORT_MINOR_VERSION = $$QT_MINOR_VERSION - QT_QT3SUPPORT_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.qt3support.name = Qt3Support -+QT.qt3support.bins = $$QT_MODULE_BIN_BASE - QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Support - QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private - QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support -diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt -index 2dcbaf3..0433240 100755 ---- a/qtkernel/bin/syncqt -+++ b/qtkernel/bin/syncqt -@@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) { - my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname"; - open MODULE_PRI_FILE, ">$moduleprifwd"; - print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; -+ print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; - print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; - print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n"; - print MODULE_PRI_FILE "include($modulepri)\n"; -diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf -index 2973c7e..7e80ad3 100644 ---- a/qtkernel/mkspecs/features/qt_config.prf -+++ b/qtkernel/mkspecs/features/qt_config.prf -@@ -20,6 +20,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - # qt_<module>.pri forwarding file - QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] - QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] -+ QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] - include($$mod) - } - } -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index 9182f87..a145b9d 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -157,10 +157,13 @@ defineTest(qtAddModule) { - - # variable, default - defineTest(qtPrepareTool) { -- isEmpty($$1) { -- !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2 -- else:$$1 = $$[QT_INSTALL_BINS]/$$2 -+ MODBASE = $$[QT_INSTALL_BINS] -+ !isEmpty(QT_BUILD_TREE):MODBASE = $$QT_BUILD_TREE/bin -+ count(ARGS, 2, greaterThan) { -+ isEmpty(QT.$${3}.bins):warning("No QT.$${3}.bins, module path ignored for qtPrepareTool($$1, $$2, $$3)") -+ else:MODBASE = $$eval(QT.$${3}.bins) - } -+ isEmpty($$1):$$1 = $$MODBASE/$$2 - $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { - exists($$eval($$1).bat) { -diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri -index 494f96f..99f3fa6 100644 ---- a/qtkernel/src/modules/qt_core.pri -+++ b/qtkernel/src/modules/qt_core.pri -@@ -4,6 +4,7 @@ QT_CORE_MINOR_VERSION = $$QT_MINOR_VERSION - QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.core.name = QtCore -+QT.core.bins = $$QT_MODULE_BIN_BASE - QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore - QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private - QT.core.sources = $$QT_MODULE_BASE/src/corelib -diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri -index 73fdf99..74949b1 100644 ---- a/qtkernel/src/modules/qt_dbus.pri -+++ b/qtkernel/src/modules/qt_dbus.pri -@@ -4,6 +4,7 @@ QT_DBUS_MINOR_VERSION = $$QT_MINOR_VERSION - QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.dbus.name = QtDBus -+QT.dbus.bins = $$QT_MODULE_BIN_BASE - QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus - QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private - QT.dbus.sources = $$QT_MODULE_BASE/src/dbus -diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri -index c8b1f00..37c941b 100644 ---- a/qtkernel/src/modules/qt_network.pri -+++ b/qtkernel/src/modules/qt_network.pri -@@ -4,6 +4,7 @@ QT_NETWORK_MINOR_VERSION = $$QT_MINOR_VERSION - QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.network.name = QtNetwork -+QT.network.bins = $$QT_MODULE_BIN_BASE - QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork - QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private - QT.network.sources = $$QT_MODULE_BASE/src/network -diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri -index eb47b00..0bd0df7 100644 ---- a/qtkernel/src/modules/qt_opengl.pri -+++ b/qtkernel/src/modules/qt_opengl.pri -@@ -4,6 +4,7 @@ QT_OPENGL_MINOR_VERSION = $$QT_MINOR_VERSION - QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.opengl.name = QtOpenGL -+QT.opengl.bins = $$QT_MODULE_BIN_BASE - QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL - QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private - QT.opengl.sources = $$QT_MODULE_BASE/src/opengl -diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri -index 09811ba..9a3ef8b 100644 ---- a/qtkernel/src/modules/qt_openvg.pri -+++ b/qtkernel/src/modules/qt_openvg.pri -@@ -4,6 +4,7 @@ QT_OPENVG_MINOR_VERSION = $$QT_MINOR_VERSION - QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.openvg.name = QtOpenVG -+QT.openvg.bins = $$QT_MODULE_BIN_BASE - QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG - QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private - QT.openvg.sources = $$QT_MODULE_BASE/src/openvg -diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri -index 42dde1b..d9b856e 100644 ---- a/qtkernel/src/modules/qt_sql.pri -+++ b/qtkernel/src/modules/qt_sql.pri -@@ -4,6 +4,7 @@ QT_SQL_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.sql.name = QtSql -+QT.sql.bins = $$QT_MODULE_BIN_BASE - QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql - QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private - QT.sql.sources = $$QT_MODULE_BASE/src/sql -diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri -index 5971808..7e9ca09 100644 ---- a/qtkernel/src/modules/qt_testlib.pri -+++ b/qtkernel/src/modules/qt_testlib.pri -@@ -4,6 +4,7 @@ QT_TEST_MINOR_VERSION = $$QT_MINOR_VERSION - QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.testlib.name = QtTest -+QT.testlib.bins = $$QT_MODULE_BIN_BASE - QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest - QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private - QT.testlib.sources = $$QT_MODULE_BASE/src/testlib -diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri -index c0c630c..c967cd7 100644 ---- a/qtkernel/src/modules/qt_xml.pri -+++ b/qtkernel/src/modules/qt_xml.pri -@@ -4,6 +4,7 @@ QT_XML_MINOR_VERSION = $$QT_MINOR_VERSION - QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.xml.name = QtXml -+QT.xml.bins = $$QT_MODULE_BIN_BASE - QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml - QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private - QT.xml.sources = $$QT_MODULE_BASE/src/xml -diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri -index 97119d6..3964a956 100644 ---- a/qtquick/modules/qt_declarative.pri -+++ b/qtquick/modules/qt_declarative.pri -@@ -4,6 +4,7 @@ QT_DECLARATIVE_MINOR_VERSION = $$QT_MINOR_VERSION - QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.declarative.name = QtDeclarative -+QT.declarative.bins = $$QT_MODULE_BIN_BASE - QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative - QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private - QT.declarative.sources = $$QT_MODULE_BASE/src/declarative -diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri -index 609f59d..a5d16ba 100644 ---- a/qtscript/modules/qt_script.pri -+++ b/qtscript/modules/qt_script.pri -@@ -4,6 +4,7 @@ QT_SCRIPT_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.script.name = QtScript -+QT.script.bins = $$QT_MODULE_BIN_BASE - QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript - QT.script.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScript/private - QT.script.sources = $$QT_MODULE_BASE/src/script -diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri -index 2ade9f5..2285743 100644 ---- a/qtscript/modules/qt_scripttools.pri -+++ b/qtscript/modules/qt_scripttools.pri -@@ -4,6 +4,7 @@ QT_SCRIPTTOOLS_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.scripttools.name = QtScriptTools -+QT.scripttools.bins = $$QT_MODULE_BIN_BASE - QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScriptTools - QT.scripttools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools/private - QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools -diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri -index 90e9865..88edb85 100644 ---- a/qtsvg/modules/qt_svg.pri -+++ b/qtsvg/modules/qt_svg.pri -@@ -4,6 +4,7 @@ QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.svg.name = QtSvg -+QT.svg.bins = $$QT_MODULE_BIN_BASE - QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg - QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private - QT.svg.sources = $$QT_MODULE_BASE/src/svg -diff --git a/qttools/modules/qt_clucene.pri b/qttools/modules/qt_clucene.pri -index dc709bc..77beaa6 100644 ---- a/qttools/modules/qt_clucene.pri -+++ b/qttools/modules/qt_clucene.pri -@@ -4,6 +4,7 @@ QT_CLUCENE_MINOR_VERSION = $$QT_MINOR_VERSION - QT_CLUCENE_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.clucene.name = QtCLucene -+QT.clucene.bins = $$QT_MODULE_BIN_BASE - QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucene - QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/private - QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch -diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri -index 01340ac..a617834 100644 ---- a/qttools/modules/qt_designer.pri -+++ b/qttools/modules/qt_designer.pri -@@ -4,6 +4,7 @@ QT_DESIGNER_MINOR_VERSION = $$QT_MINOR_VERSION - QT_DESIGNER_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.designer.name = QtDesigner -+QT.designer.bins = $$QT_MODULE_BIN_BASE - QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesigner - QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private - QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib -diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri -index d99f57aa..07e815d 100644 ---- a/qttools/modules/qt_help.pri -+++ b/qttools/modules/qt_help.pri -@@ -4,6 +4,7 @@ QT_HELP_MINOR_VERSION = $$QT_MINOR_VERSION - QT_HELP_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.help.name = QtHelp -+QT.help.bins = $$QT_MODULE_BIN_BASE - QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp - QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private - QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib -diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri -index 65a527e..c5160c5 100644 ---- a/qttools/modules/qt_uitools.pri -+++ b/qttools/modules/qt_uitools.pri -@@ -4,6 +4,7 @@ QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION - QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.uitools.name = QtUiTools -+QT.uitools.bins = $$QT_MODULE_BIN_BASE - QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools - QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private - QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools -diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri -index 412d78e..8a83868 100644 ---- a/qtxmlpatterns/modules/qt_xmlpatterns.pri -+++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri -@@ -4,6 +4,7 @@ QT_XMLPATTERNS_MINOR_VERSION = $$QT_MINOR_VERSION - QT_XMLPATTERNS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.xmlpatterns.name = QtXmlPatterns -+QT.xmlpatterns.bins = $$QT_MODULE_BIN_BASE - QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns - QT.xmlpatterns.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns/private - QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0039-examples.pro-removed-moved-subdirectories.patch b/patches/master/0039-examples.pro-removed-moved-subdirectories.patch deleted file mode 100644 index aaae52a..0000000 --- a/patches/master/0039-examples.pro-removed-moved-subdirectories.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f9d03ea8c2134c5131cf19217098eca4e022e933 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <olivier.goffart@nokia.com> -Date: Fri, 7 Jan 2011 13:46:25 +0100 -Subject: [PATCH] examples.pro removed moved subdirectories - ---- - qtkernel/examples/examples.pro | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -diff --git a/qtkernel/examples/examples.pro b/qtkernel/examples/examples.pro -index f8294c4..ec0c1b0 100644 ---- a/qtkernel/examples/examples.pro -+++ b/qtkernel/examples/examples.pro -@@ -50,9 +50,6 @@ symbian: SUBDIRS = \ - SUBDIRS += multimedia - } - --contains(QT_CONFIG, script): SUBDIRS += script -- --contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon - embedded:SUBDIRS += qws - !wince*:!symbian: { - !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer -@@ -63,9 +60,6 @@ embedded:SUBDIRS += qws - contains(QT_CONFIG, opengl): SUBDIRS += opengl - contains(QT_CONFIG, openvg): SUBDIRS += openvg - contains(QT_CONFIG, dbus): SUBDIRS += dbus --contains(QT_CONFIG, declarative): SUBDIRS += declarative --win32: SUBDIRS += activeqt --contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns - contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows - contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent - --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0041-Make-auto-test-build.patch b/patches/master/0041-Make-auto-test-build.patch deleted file mode 100644 index c04f6a7..0000000 --- a/patches/master/0041-Make-auto-test-build.patch +++ /dev/null @@ -1,188 +0,0 @@ -From 880f8a40fb25a1ff03bf6c51f3cf0c1236fe3867 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Fri, 7 Jan 2011 13:47:49 +0100 -Subject: [PATCH] Make auto test build - ---- - phonon/tests/auto/auto.pro | 3 +++ - qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro | 3 +++ - .../tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp | 2 +- - .../auto/q3sqlselectcursor/q3sqlselectcursor.pro | 2 ++ - .../q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 2 +- - qtkernel/tests/auto/auto.pro | 10 ---------- - .../tests/auto/declarative/examples/examples.pro | 2 +- - .../qdeclarativesqldatabase.pro | 2 +- - .../qdeclarativeviewer/qdeclarativeviewer.pro | 2 +- - .../qapplicationargumentparser.pro | 2 +- - .../auto/xmlpatternsschema/xmlpatternsschema.pro | 4 +++- - .../tests/auto/xmlpatternssdk/xmlpatternssdk.pro | 7 ++++--- - 12 files changed, 21 insertions(+), 20 deletions(-) - create mode 100644 phonon/tests/auto/auto.pro - -diff --git a/phonon/tests/auto/auto.pro b/phonon/tests/auto/auto.pro -new file mode 100644 -index 0000000..ef6bdf4 ---- /dev/null -+++ b/phonon/tests/auto/auto.pro -@@ -0,0 +1,3 @@ -+TEMPLATE = subdirs -+ -+contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro -diff --git a/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro b/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro -index 2d316fb..7da4f8b 100644 ---- a/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro -+++ b/qt3support/tests/auto/q3sqlcursor/q3sqlcursor.pro -@@ -1,5 +1,8 @@ - load(qttest_p4) -+load(qt_module) -+ - SOURCES += tst_q3sqlcursor.cpp -+INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto - - QT += sql qt3support - requires(contains(QT_CONFIG,qt3support)) -diff --git a/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp -index 6f3722d..7103fb5 100644 ---- a/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp -+++ b/qt3support/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp -@@ -46,7 +46,7 @@ - #include <qsqldriver.h> - #include <QSet> - --#include "../qsqldatabase/tst_databases.h" -+#include "qsqldatabase/tst_databases.h" - - const QString qtest(qTableName( "qtest", __FILE__ )); - -diff --git a/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro b/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro -index 59448eb..48d5bfe 100644 ---- a/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro -+++ b/qt3support/tests/auto/q3sqlselectcursor/q3sqlselectcursor.pro -@@ -1,5 +1,7 @@ - load(qttest_p4) -+load(qt_module) - SOURCES += tst_q3sqlselectcursor.cpp -+INCLUDEPATH += $$QT_SOURCE_TREE/tests/auto - - QT += sql qt3support - requires(contains(QT_CONFIG,qt3support)) -diff --git a/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp b/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp -index a5eecde..2ac7e80 100644 ---- a/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp -+++ b/qt3support/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp -@@ -49,7 +49,7 @@ - #define NODATABASE_SKIP "No database drivers are available in this Qt configuration" - - --#include "../qsqldatabase/tst_databases.h" -+#include "qsqldatabase/tst_databases.h" - - //TESTED_FILES= - -diff --git a/qtkernel/tests/auto/auto.pro b/qtkernel/tests/auto/auto.pro -index c677249..02e8b5b 100644 ---- a/qtkernel/tests/auto/auto.pro -+++ b/qtkernel/tests/auto/auto.pro -@@ -9,15 +9,5 @@ SUBDIRS += \ - other.pro - - !cross_compile: SUBDIRS += host.pro --contains(QT_CONFIG, qt3support):!wince*: SUBDIRS += qt3support.pro - contains(QT_CONFIG, opengl): SUBDIRS += opengl.pro --contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns.pro - unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro --contains(QT_CONFIG, script): SUBDIRS += script.pro --contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro --contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro --contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro --contains(QT_CONFIG, svg): SUBDIRS += svg.pro --contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro --!symbian SUBDIRS += help.pro -- -diff --git a/qtquick/tests/auto/declarative/examples/examples.pro b/qtquick/tests/auto/declarative/examples/examples.pro -index dafc146..fa632f0 100644 ---- a/qtquick/tests/auto/declarative/examples/examples.pro -+++ b/qtquick/tests/auto/declarative/examples/examples.pro -@@ -4,7 +4,7 @@ macx:CONFIG -= app_bundle - - SOURCES += tst_examples.cpp - --include(../../../../tools/qml/qml.pri) -+include(../../../../tools/qmlviewer/qml.pri) - - include(../symbianlibs.pri) - -diff --git a/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro -index 0d335a5..bce758a 100644 ---- a/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro -+++ b/qtquick/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro -@@ -1,6 +1,6 @@ - load(qttest_p4) - contains(QT_CONFIG,declarative): QT += declarative --QT += sql script -+QT += sql script webkit - macx:CONFIG -= app_bundle - - SOURCES += tst_qdeclarativesqldatabase.cpp -diff --git a/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro b/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro -index 8d4b410..46a3dae 100644 ---- a/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro -+++ b/qtquick/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro -@@ -2,7 +2,7 @@ load(qttest_p4) - contains(QT_CONFIG,declarative): QT += declarative gui - macx:CONFIG -= app_bundle - --include(../../../../tools/qml/qml.pri) -+include(../../../../tools/qmlviewer/qml.pri) - - SOURCES += tst_qdeclarativeviewer.cpp - -diff --git a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro -index df32e92..80e207f 100644 ---- a/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro -+++ b/qtxmlpatterns/tests/auto/qapplicationargumentparser/qapplicationargumentparser.pro -@@ -3,4 +3,4 @@ SOURCES += tst_qapplicationargumentparser.cpp \ - ../../../tools/xmlpatterns/qapplicationargument.cpp \ - ../../../tools/xmlpatterns/qapplicationargumentparser.cpp - QT -= gui --INCLUDEPATH += $$QT_SOURCE_TREE/tools/xmlpatterns/ -+INCLUDEPATH += ../../../tools/xmlpatterns/ -diff --git a/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro b/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro -index 2ba869a..734ac26 100644 ---- a/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro -+++ b/qtxmlpatterns/tests/auto/xmlpatternsschema/xmlpatternsschema.pro -@@ -1,6 +1,8 @@ - load(qttest_p4) -+load(qt_module) -+ - SOURCES += tst_xmlpatternsschema.cpp \ - - include (../xmlpatterns.pri) - --INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private -+INCLUDEPATH += $$QT.xmlpatterns.private_includes -diff --git a/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro b/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro -index 6204f01..9ba9cb6 100644 ---- a/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro -+++ b/qtxmlpatterns/tests/auto/xmlpatternssdk/xmlpatternssdk.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - include (../xmlpatterns.pri) - - TARGET = $$XMLPATTERNS_SDK -@@ -27,9 +29,8 @@ DESTDIR = $$QT_BUILD_TREE/lib - - # syncqt doesn't copy headers in tools/ so let's manually ensure - # it works with shadow builds and source builds. --INCLUDEPATH += $$QT_BUILD_TREE/include/QtXmlPatterns/private \ -- $$QT_SOURCE_TREE/include/QtXmlPatterns/private \ -- $$QT_SOURCE_TREE/tools/xmlpatterns -+INCLUDEPATH += $$QT.xmlpatterns.private_includes \ -+ ../../../tools/xmlpatterns - - HEADERS = ASTItem.h \ - DebugExpressionFactory.h \ --- -1.7.1 - diff --git a/patches/master/0043-compile-qtquick-import.patch b/patches/master/0043-compile-qtquick-import.patch deleted file mode 100644 index 15f521a..0000000 --- a/patches/master/0043-compile-qtquick-import.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5f3b10279c2c4068c16036e70624c60e666b1171 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <olivier.goffart@nokia.com> -Date: Tue, 11 Jan 2011 11:09:56 +0100 -Subject: [PATCH] compile qtquick/import - ---- - qtquick/src/imports/qimportbase.pri | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/qtquick/src/imports/qimportbase.pri b/qtquick/src/imports/qimportbase.pri -index 0f70030..b0d2181 100644 ---- a/qtquick/src/imports/qimportbase.pri -+++ b/qtquick/src/imports/qimportbase.pri -@@ -1,4 +1,6 @@ --symbian:include(../plugins/qpluginbase.pri) -+load(qt_module) -+ -+symbian:include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) - TEMPLATE = lib - CONFIG += qt plugin - -@@ -25,7 +27,7 @@ QMAKE_EXTRA_COMPILERS += copy2build - TARGET = $$qtLibraryTarget($$TARGET) - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - --include(../qt_targets.pri) -+include($$QT_SOURCE_TREE/src/qt_targets.pri) - - wince*:LIBS += $$QMAKE_LIBS_GUI - --- -1.7.1 - diff --git a/patches/master/0044-Move-uitools-from-QtTools-to-QtKernel.patch b/patches/master/0044-Move-uitools-from-QtTools-to-QtKernel.patch deleted file mode 100644 index 453bc05..0000000 --- a/patches/master/0044-Move-uitools-from-QtTools-to-QtKernel.patch +++ /dev/null @@ -1,475 +0,0 @@ -From 3196dfa2ae713f1c13384769f06400f4891fd1c4 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@nokia.com> -Date: Wed, 12 Jan 2011 21:06:11 +0100 -Subject: [PATCH] Move uitools from QtTools to QtKernel - ---- - qtkernel/src/modules/qt_uilib.pri | 12 +++ - {qttools => qtkernel/src}/modules/qt_uitools.pri | 4 +- - qtkernel/src/src.pro | 5 +- - qtkernel/src/uitools/uitools.pro | 10 +- - qtkernel/sync.profile | 6 + - qtkernel/tools/uilib/abstractformbuilder.h | 2 +- - qtkernel/tools/uilib/customwidget.h | 2 +- - qtkernel/tools/uilib/extension.h | 109 +++++++++++++++++++++ - qtkernel/tools/uilib/formbuilder.h | 4 +- - qtkernel/tools/uilib/formscriptrunner_p.h | 2 +- - qtkernel/tools/uilib/properties_p.h | 2 +- - qtkernel/tools/uilib/resourcebuilder_p.h | 2 +- - qtkernel/tools/uilib/textbuilder_p.h | 2 +- - qttools/src/designer/src/components/component.pri | 3 +- - qttools/src/designer/src/components/lib/lib.pro | 2 +- - qttools/src/designer/src/designer/designer.pro | 2 +- - qttools/src/designer/src/lib/lib.pro | 3 +- - qttools/src/designer/src/src.pro | 3 - - qttools/src/linguist/linguist/linguist.pro | 6 +- - qttools/sync.profile | 2 - - 20 files changed, 155 insertions(+), 28 deletions(-) - create mode 100644 qtkernel/src/modules/qt_uilib.pri - rename {qttools => qtkernel/src}/modules/qt_uitools.pri (75%) - create mode 100644 qtkernel/tools/uilib/extension.h - -diff --git a/qtkernel/src/modules/qt_uilib.pri b/qtkernel/src/modules/qt_uilib.pri -new file mode 100644 -index 0000000..0e143de ---- /dev/null -+++ b/qtkernel/src/modules/qt_uilib.pri -@@ -0,0 +1,12 @@ -+QT_UILIB_VERSION = $$QT_VERSION -+QT_UILIB_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_UILIB_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_UILIB_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.uilib.name = -+QT.uilib.bins = $$QT_MODULE_BIN_BASE -+QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner -+QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private -+QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib -+QT.uilib.libs = $$QT_MODULE_LIB_BASE -+QT.uilib.depends = xml -diff --git a/qttools/modules/qt_uitools.pri b/qtkernel/src/modules/qt_uitools.pri -similarity index 75% -rename from qttools/modules/qt_uitools.pri -rename to qtkernel/src/modules/qt_uitools.pri -index c5160c5..1f4070c 100644 ---- a/qttools/modules/qt_uitools.pri -+++ b/qtkernel/src/modules/qt_uitools.pri -@@ -5,9 +5,9 @@ QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.uitools.name = QtUiTools - QT.uitools.bins = $$QT_MODULE_BIN_BASE --QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools -+QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools - QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private --QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools -+QT.uitools.sources = $$QT_MODULE_BASE/src/uitools - QT.uitools.libs = $$QT_MODULE_LIB_BASE - QT.uitools.depends = xml - QT.uitools.DEFINES = QT_UITOOLS_LIB -diff --git a/qtkernel/src/src.pro b/qtkernel/src/src.pro -index 2f65a08..cd4b7f7 100644 ---- a/qtkernel/src/src.pro -+++ b/qtkernel/src/src.pro -@@ -4,7 +4,7 @@ TEMPLATE = subdirs - unset(SRC_SUBDIRS) - win32:SRC_SUBDIRS += src_winmain - symbian:SRC_SUBDIRS += src_s60main --SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml -+SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml src_uitools - nacl: SRC_SUBDIRS -= src_network src_testlib - !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus - !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui -@@ -29,6 +29,8 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib - src_corelib.target = sub-corelib - src_xml.subdir = $$QT_SOURCE_TREE/src/xml - src_xml.target = sub-xml -+src_uitools.subdir = $$QT_SOURCE_TREE/src/uitools -+src_uitools.target = sub-uitools - src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus - src_dbus.target = sub-dbus - src_gui.subdir = $$QT_SOURCE_TREE/src/gui -@@ -52,6 +54,7 @@ src_testlib.target = sub-testlib - src_gui.depends = src_corelib src_tools_uic - embedded: src_gui.depends += src_network - src_xml.depends = src_corelib -+ src_uitools.depends = src_corelib src_xml - src_dbus.depends = src_corelib src_xml - src_network.depends = src_corelib - src_opengl.depends = src_gui -diff --git a/qtkernel/src/uitools/uitools.pro b/qtkernel/src/uitools/uitools.pro -index 6e0a247..3ce29fa 100644 ---- a/qtkernel/src/uitools/uitools.pro -+++ b/qtkernel/src/uitools/uitools.pro -@@ -1,9 +1,9 @@ -+MODULE = uitools -+QPRO_PWD = $$PWD - TEMPLATE = lib - TARGET = $$qtLibraryTarget(QtUiTools) --QT += xml -+QT = core xml - CONFIG += qt staticlib --DESTDIR = ../../../../lib --DLLDESTDIR = ../../../../bin - - symbian { - TARGET.UID3 = 0x2001E628 -@@ -18,11 +18,11 @@ isEmpty(QT_MAJOR_VERSION) { - } else { - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} - } --include(../../../../src/qt_targets.pri) -+include(../qt_targets.pri) - QMAKE_TARGET_PRODUCT = UiLoader - QMAKE_TARGET_DESCRIPTION = QUiLoader - --include(../lib/uilib/uilib.pri) -+include(../../tools/uilib/uilib.pri) - - HEADERS += quiloader.h - SOURCES += quiloader.cpp -diff --git a/qtkernel/sync.profile b/qtkernel/sync.profile -index 7984329..9631d22 100644 ---- a/qtkernel/sync.profile -+++ b/qtkernel/sync.profile -@@ -8,6 +8,8 @@ - "QtNetwork" => "$basedir/src/network", - "QtTest" => "$basedir/src/testlib", - "QtDBus" => "$basedir/src/dbus", -+ "QtUiTools" => "$basedir/src/uitools", -+ "QtDesigner" => "$basedir/tools/uilib", - ); - %moduleheaders = ( # restrict the module headers to those found in relative path - ); -@@ -34,6 +36,8 @@ - "opengl" => "#include <QtOpenGL/QtOpenGL>\n", - "openvg" => "#include <QtOpenVG/QtOpenVG>\n", - "xml" => "#include <QtXml/QtXml>\n", -+ "uitools" => "#include <QtUiTools/QtUiTools>\n", -+ "designer" => "#include <QtDesigner/QtDesigner>\n", - ); - %modulepris = ( - "QtCore" => "$basedir/src/modules/qt_core.pri", -@@ -45,6 +49,8 @@ - "QtSql" => "$basedir/src/modules/qt_sql.pri", - "QtTest" => "$basedir/src/modules/qt_testlib.pri", - "QtXml" => "$basedir/src/modules/qt_xml.pri", -+ "QtUiTools" => "$basedir/src/modules/qt_uitools.pri", -+ "QtDesigner" => "$basedir/src/modules/qt_uilib.pri", - ); - - @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); -diff --git a/qtkernel/tools/uilib/abstractformbuilder.h b/qtkernel/tools/uilib/abstractformbuilder.h -index b76f0e4..2f99b36 100644 ---- a/qtkernel/tools/uilib/abstractformbuilder.h -+++ b/qtkernel/tools/uilib/abstractformbuilder.h -@@ -42,7 +42,7 @@ - #ifndef ABSTRACTFORMBUILDER_H - #define ABSTRACTFORMBUILDER_H - --#include <QtDesigner/uilib_global.h> -+#include "uilib_global.h" - - #include <QtCore/QList> - #include <QtCore/QHash> -diff --git a/qtkernel/tools/uilib/customwidget.h b/qtkernel/tools/uilib/customwidget.h -index 52c2342..0a04c93 100644 ---- a/qtkernel/tools/uilib/customwidget.h -+++ b/qtkernel/tools/uilib/customwidget.h -@@ -42,7 +42,7 @@ - #ifndef CUSTOMWIDGET_H - #define CUSTOMWIDGET_H - --#include <QtDesigner/extension.h> -+#include "extension.h" - #include <QtCore/QObject> - #include <QtCore/QString> - #include <QtGui/QIcon> -diff --git a/qtkernel/tools/uilib/extension.h b/qtkernel/tools/uilib/extension.h -new file mode 100644 -index 0000000..d13e517 ---- /dev/null -+++ b/qtkernel/tools/uilib/extension.h -@@ -0,0 +1,109 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -+** All rights reserved. -+** Contact: Nokia Corporation (qt-info@nokia.com) -+** -+** This file is part of the Qt Designer of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** No Commercial Usage -+** This file contains pre-release code and may not be distributed. -+** You may use this file in accordance with the terms and conditions -+** contained in the Technology Preview License Agreement accompanying -+** this package. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 as published by the Free Software -+** Foundation and appearing in the file LICENSE.LGPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU Lesser General Public License version 2.1 requirements -+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** If you have questions regarding the use of this file, please contact -+** Nokia at qt-info@nokia.com. -+** -+** -+** -+** -+** -+** -+** -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#ifndef EXTENSION_H -+#define EXTENSION_H -+ -+#include <QtCore/QString> -+#include <QtCore/QObject> -+ -+QT_BEGIN_HEADER -+ -+QT_BEGIN_NAMESPACE -+ -+#define Q_TYPEID(IFace) QLatin1String(IFace##_iid) -+ -+class QAbstractExtensionFactory -+{ -+public: -+ virtual ~QAbstractExtensionFactory() {} -+ -+ virtual QObject *extension(QObject *object, const QString &iid) const = 0; -+}; -+Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "com.trolltech.Qt.QAbstractExtensionFactory") -+ -+class QAbstractExtensionManager -+{ -+public: -+ virtual ~QAbstractExtensionManager() {} -+ -+ virtual void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0; -+ virtual void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0; -+ -+ virtual QObject *extension(QObject *object, const QString &iid) const = 0; -+}; -+Q_DECLARE_INTERFACE(QAbstractExtensionManager, "com.trolltech.Qt.QAbstractExtensionManager") -+ -+#if defined(Q_CC_MSVC) && (_MSC_VER < 1300) -+ -+template <class T> -+inline T qt_extension_helper(QAbstractExtensionManager *, QObject *, T) -+{ return 0; } -+ -+template <class T> -+inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) -+{ return qt_extension_helper(manager, object, T(0)); } -+ -+#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ -+const char * const IFace##_iid = IId; \ -+Q_DECLARE_INTERFACE(IFace, IId) \ -+template <> inline IFace *qt_extension_helper<IFace *>(QAbstractExtensionManager *manager, QObject *object, IFace *) \ -+{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return (IFace *)(extension ? extension->qt_metacast(IFace##_iid) : 0); } -+ -+#else -+ -+template <class T> -+inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) -+{ return 0; } -+ -+#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ -+const char * const IFace##_iid = IId; \ -+Q_DECLARE_INTERFACE(IFace, IId) \ -+template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manager, QObject *object) \ -+{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(0); } -+ -+#endif -+ -+QT_END_NAMESPACE -+ -+QT_END_HEADER -+ -+#endif // EXTENSION_H -diff --git a/qtkernel/tools/uilib/formbuilder.h b/qtkernel/tools/uilib/formbuilder.h -index 01aeb16..1d3dc5a 100644 ---- a/qtkernel/tools/uilib/formbuilder.h -+++ b/qtkernel/tools/uilib/formbuilder.h -@@ -42,8 +42,8 @@ - #ifndef FORMBUILDER_H - #define FORMBUILDER_H - --#include <QtDesigner/uilib_global.h> --#include <QtDesigner/QAbstractFormBuilder> -+#include "uilib_global.h" -+#include "abstractformbuilder.h" - - #include <QtCore/QStringList> - #include <QtCore/QMap> -diff --git a/qtkernel/tools/uilib/formscriptrunner_p.h b/qtkernel/tools/uilib/formscriptrunner_p.h -index 117b4e8..c13bd4c 100644 ---- a/qtkernel/tools/uilib/formscriptrunner_p.h -+++ b/qtkernel/tools/uilib/formscriptrunner_p.h -@@ -53,7 +53,7 @@ - // We mean it. - // - --#include <QtDesigner/uilib_global.h> -+#include "uilib_global.h" - #include <QtCore/QList> - #include <QtCore/QFlags> - #include <QtCore/QString> -diff --git a/qtkernel/tools/uilib/properties_p.h b/qtkernel/tools/uilib/properties_p.h -index 5f40f87..e57f9ed 100644 ---- a/qtkernel/tools/uilib/properties_p.h -+++ b/qtkernel/tools/uilib/properties_p.h -@@ -53,7 +53,7 @@ - #ifndef UILIBPROPERTIES_H - #define UILIBPROPERTIES_H - --#include <QtDesigner/uilib_global.h> -+#include "uilib_global.h" - - #include <QtCore/QObject> - #include <QtCore/QMetaProperty> -diff --git a/qtkernel/tools/uilib/resourcebuilder_p.h b/qtkernel/tools/uilib/resourcebuilder_p.h -index a3ccbf8..549d816 100644 ---- a/qtkernel/tools/uilib/resourcebuilder_p.h -+++ b/qtkernel/tools/uilib/resourcebuilder_p.h -@@ -53,7 +53,7 @@ - // We mean it. - // - --#include <QtDesigner/uilib_global.h> -+#include "uilib_global.h" - #include <QtCore/QList> - #include <QtCore/QString> - -diff --git a/qtkernel/tools/uilib/textbuilder_p.h b/qtkernel/tools/uilib/textbuilder_p.h -index 8da296d..066733c 100644 ---- a/qtkernel/tools/uilib/textbuilder_p.h -+++ b/qtkernel/tools/uilib/textbuilder_p.h -@@ -53,7 +53,7 @@ - // We mean it. - // - --#include <QtDesigner/uilib_global.h> -+#include "uilib_global.h" - #include <QtCore/QList> - #include <QtCore/QString> - -diff --git a/qttools/src/designer/src/components/component.pri b/qttools/src/designer/src/components/component.pri -index c2fc10d..1dd8cf0 100644 ---- a/qttools/src/designer/src/components/component.pri -+++ b/qttools/src/designer/src/components/component.pri -@@ -1,2 +1,3 @@ -- -+load(qt_module) - TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end -+INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib -diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro -index 165315e..852ec23 100644 ---- a/qttools/src/designer/src/components/lib/lib.pro -+++ b/qttools/src/designer/src/components/lib/lib.pro -@@ -48,7 +48,7 @@ INCLUDEPATH += . .. \ - $$PWD/../../lib/components \ - $$PWD/../../lib/sdk \ - $$PWD/../../lib/extension \ -- $$PWD/../../lib/uilib \ -+ $$QT_SOURCE_TREE/tools/uilib \ - $$PWD/../../lib/shared - - include(../propertyeditor/propertyeditor.pri) -diff --git a/qttools/src/designer/src/designer/designer.pro b/qttools/src/designer/src/designer/designer.pro -index 42cd345..b3de616 100644 ---- a/qttools/src/designer/src/designer/designer.pro -+++ b/qttools/src/designer/src/designer/designer.pro -@@ -12,7 +12,7 @@ INCLUDEPATH += \ - ../lib/sdk \ - ../lib/extension \ - ../lib/shared \ -- ../lib/uilib \ -+ $$QT_SOURCE_TREE/tools/uilib \ - extra - - QMAKE_LIBDIR += ../../lib ../../../../lib -diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro -index 4e0e2b2..a277f61 100644 ---- a/qttools/src/designer/src/lib/lib.pro -+++ b/qttools/src/designer/src/lib/lib.pro -@@ -59,7 +59,8 @@ mac:!static:contains(QT_CONFIG, qt_framework) { - - include(extension/extension.pri) - include(sdk/sdk.pri) --include(uilib/uilib.pri) -+include($$QT_SOURCE_TREE/tools/uilib/uilib.pri) -+INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib - include(shared/shared.pri) - PRECOMPILED_HEADER=lib_pch.h - -diff --git a/qttools/src/designer/src/src.pro b/qttools/src/designer/src/src.pro -index 78665b7..40da11f 100644 ---- a/qttools/src/designer/src/src.pro -+++ b/qttools/src/designer/src/src.pro -@@ -2,11 +2,8 @@ TEMPLATE = subdirs - CONFIG += ordered - - SUBDIRS = \ -- uitools \ - lib \ - components \ - designer - - CONFIG(shared,shared|static):SUBDIRS += plugins -- --symbian|wince*: SUBDIRS = uitools -diff --git a/qttools/src/linguist/linguist/linguist.pro b/qttools/src/linguist/linguist/linguist.pro -index ce78d13..50fd088 100644 ---- a/qttools/src/linguist/linguist/linguist.pro -+++ b/qttools/src/linguist/linguist/linguist.pro -@@ -1,4 +1,4 @@ --load(qt_modules) -+load(qt_module) - - TEMPLATE = app - LANGUAGE = C++ -@@ -20,8 +20,8 @@ include(../shared/formats.pri) - - DEFINES += QFORMINTERNAL_NAMESPACE - --INCLUDEPATH += ../../designer/src/uitools --INCLUDEPATH += ../../designer/src/lib/uilib -+INCLUDEPATH += $$QT_SOURCE_TREE/src/uitools -+INCLUDEPATH += $$QT_SOURCE_TREE/tools/uilib - - SOURCES += \ - batchtranslationdialog.cpp \ -diff --git a/qttools/sync.profile b/qttools/sync.profile -index 0e4a6c3..cfeac5e 100644 ---- a/qttools/sync.profile -+++ b/qttools/sync.profile -@@ -2,7 +2,6 @@ - "QtCLucene" => "$basedir/src/assistant/lib/fulltextsearch", - "QtHelp" => "$basedir/src/assistant/lib", - "QtDesigner" => "$basedir/src/designer/src/lib", -- "QtUiTools" => "$basedir/src/designer/src/uitools", - ); - %moduleheaders = ( # restrict the module headers to those found in relative path - ); -@@ -24,5 +23,4 @@ - "QtCLucene" => "$basedir/modules/qt_clucene.pri", - "QtHelp" => "$basedir/modules/qt_help.pri", - "QtDesigner" => "$basedir/modules/qt_designer.pri", -- "QtUiTools" => "$basedir/modules/qt_uitools.pri", - ); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch b/patches/master/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch deleted file mode 100644 index a65b350..0000000 --- a/patches/master/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 5dc1b2627551b3d0fd3227d032f1497349c4071c Mon Sep 17 00:00:00 2001 -From: axis <qt-info@nokia.com> -Date: Fri, 14 Jan 2011 16:14:17 +0100 -Subject: [PATCH] Added new QtWebKit requirements since we need more tools now. - ---- - qtdoc/doc/src/getting-started/installation.qdoc | 60 +++++++++++++++++++++++ - 1 files changed, 60 insertions(+), 0 deletions(-) - -diff --git a/qtdoc/doc/src/getting-started/installation.qdoc b/qtdoc/doc/src/getting-started/installation.qdoc -index 6d0256e..bbbffcc 100644 ---- a/qtdoc/doc/src/getting-started/installation.qdoc -+++ b/qtdoc/doc/src/getting-started/installation.qdoc -@@ -980,6 +980,31 @@ We hope you will enjoy using Qt. - \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=0baf2b35-c656-4969-ace8-e4c0c0716adb&DisplayLang=en}{here}. - \endlist - -+ \section1 QtWebKit Dependencies -+ -+ QtWebKit depends on some extra development tools in addition to those required for the rest of Qt. -+ -+ \note These dependencies are only needed if you use a source version of Qt. -+ They are not required when using a prebuilt library. -+ -+ \list -+ \o Install \l{http://www.activestate.com/Products/ActivePerl/}{ActiveState Perl} -+ \o Install \l{http://www.python.org/download/}{Python 2.x} -+ (and add the installation location to your PATH) -+ \o In addition, you need these external GNU tools from the -+ \l{http://gnuwin32.sourceforge.net/packages.html}{GnuWin32 Project}: -+ \list -+ \o \l{http://gnuwin32.sourceforge.net/downlinks/bison.php}{Bison} -+ \o \l{http://gnuwin32.sourceforge.net/downlinks/gperf.php}{GPerf} -+ \o \l{http://gnuwin32.sourceforge.net/downlinks/flex.php}{Flex} -+ \o \l{http://gnuwin32.sourceforge.net/downlinks/libiconv.php}{LibIconv} (needed for bison) -+ \endlist -+ \endlist -+ -+ Please make sure that you install all the tools in a path without spaces in it. -+ -+ For the most up to date information about QtWebKit dependencies, please refer to the \l{http://trac.webkit.org/wiki/BuildingQtOnWindows}{QtWebKit wiki for Windows} -+ - \sa {Known Issues} - */ - -@@ -1132,6 +1157,27 @@ We hope you will enjoy using Qt. - distributions; try searching for \c gstreamer or \c libgstreamer in your - distribution's package repository to find suitable packages. - -+ \section1 QtWebKit Dependencies -+ -+ QtWebKit depends on some extra development tools in addition to those required for the rest of Qt. -+ -+ \note These dependencies are only needed if you use a source version of Qt. -+ They are not required when using a prebuilt library. -+ -+ \list -+ \o gperf -+ \o bison -+ \o flex (v2.5.33 or later) -+ \o sqlite (development version) -+ \o fontconfig (development version) -+ \o xrender (development version) -+ \o phonon (development version) -+ \endlist -+ -+ These should be available in most major Linux distributions, but the exact install instructions will vary. -+ -+ For the most up to date information about QtWebKit dependencies, please refer to the \l{http://trac.webkit.org/wiki/BuildingQtOnLinux}{QtWebKit wiki for Linux} -+ - \sa {Known Issues} - */ - -@@ -1305,6 +1351,20 @@ We hope you will enjoy using Qt. - We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start} - to get more information about how to setup the development environment. - -+ \section1 QtWebKit Dependencies -+ -+ QtWebKit depends on some extra development tools in addition to those required for the rest of Qt. -+ -+ \note These dependencies are only needed if you use a source version of Qt. -+ They are not required when using a prebuilt library. -+ -+ The dependencies are the same for Symbian as the host platform you are building on. Therefore, please -+ refer to the Requirements page for your build platform, either -+ \l{Qt for Windows Requirements#qtwebkit-dependencies}{Qt for Windows Requirements} or -+ \l{Qt for X11 Requirements#qtwebkit-dependencies}{Qt for X11 Requirements}. -+ -+ For the most up to date information about QtWebKit dependencies, please refer to the \l{http://trac.webkit.org/wiki/BuildingQtOnSymbian}{QtWebKit wiki for Symbian} -+ - \sa {Known Issues} - */ - --- -1.7.1 - diff --git a/patches/master/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch b/patches/master/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch deleted file mode 100644 index 0b6af0e..0000000 --- a/patches/master/0049-Make-configure.exe-compile-and-handle-eligible-modul.patch +++ /dev/null @@ -1,235 +0,0 @@ -From 2d639fc2cd176f31748564d3465fa28fb89140f9 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Thu, 13 Jan 2011 08:30:22 -0600 -Subject: [PATCH] Make configure.exe compile and handle "eligible modules" - ---- - qtkernel/tools/configure/configureapp.cpp | 93 ++++++++++++++--------------- - qtkernel/tools/configure/configureapp.h | 2 + - 2 files changed, 47 insertions(+), 48 deletions(-) - -diff --git a/qtkernel/tools/configure/configureapp.cpp b/qtkernel/tools/configure/configureapp.cpp -index a653aa7..143570c 100644 ---- a/qtkernel/tools/configure/configureapp.cpp -+++ b/qtkernel/tools/configure/configureapp.cpp -@@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv) - if (syncqt_bat.open(QFile::WriteOnly)) { - QTextStream stream(&syncqt_bat); - stream << "@echo off" << endl -- << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/syncqt.bat -outdir \"") << fixSeparators(buildPath) << "\" \"" << fixSeparators(sourcePath) << "\"" << endl -+ << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/syncqt.bat -outdir \"") << fixSeparators(buildPath) << "\" \"" << fixSeparators(sourcePath) << "\"" << endl; - syncqt_bat.close(); - } - } -@@ -2662,7 +2662,7 @@ void Configure::generateOutputVars() - qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]); - - if (dictionary[ "QT3SUPPORT" ] == "yes") -- qtConfig += "qt3support"; -+ qtEligibleModules += "qt3support"; - - if (dictionary[ "OPENGL" ] == "yes") - qtConfig += "opengl"; -@@ -2708,7 +2708,7 @@ void Configure::generateOutputVars() - qtConfig += "cetest"; - - if (dictionary[ "SCRIPT" ] == "yes") -- qtConfig += "script"; -+ qtEligibleModules += "script"; - - if (dictionary[ "SCRIPTTOOLS" ] == "yes") { - if (dictionary[ "SCRIPT" ] == "no") { -@@ -2716,30 +2716,26 @@ void Configure::generateOutputVars() - "disabled." << endl; - dictionary[ "DONE" ] = "error"; - } -- qtConfig += "scripttools"; -+ qtEligibleModules += "scripttools"; - } - - if (dictionary[ "XMLPATTERNS" ] == "yes") -- qtConfig += "xmlpatterns"; -+ qtEligibleModules += "xmlpatterns"; - - if (dictionary["PHONON"] == "yes") { -- qtConfig += "phonon"; -+ qtEligibleModules += "phonon"; - if (dictionary["PHONON_BACKEND"] == "yes") - qtConfig += "phonon-backend"; - } - - if (dictionary["MULTIMEDIA"] == "yes") { -- qtConfig += "multimedia"; -+ qtEligibleModules += "multimedia"; - if (dictionary["AUDIO_BACKEND"] == "yes") - qtConfig += "audio-backend"; - } - -- QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri"; -- QFile::remove(dst); - if (dictionary["WEBKIT"] != "no") { -- // This include takes care of adding "webkit" to QT_CONFIG. -- QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri"; -- QFile::copy(src, dst); -+ qtEligibleModules += "webkit"; - if (dictionary["WEBKIT"] == "debug") - qtConfig += "webkit-debug"; - } -@@ -2750,7 +2746,7 @@ void Configure::generateOutputVars() - "disabled." << endl; - dictionary[ "DONE" ] = "error"; - } -- qtConfig += "declarative"; -+ qtEligibleModules += "declarative"; - } - - if (dictionary[ "NATIVE_GESTURES" ] == "yes") -@@ -2899,81 +2895,81 @@ void Configure::generateCachefile() - } - - // Generate qmodule.pri -- QFile configFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri"); -- if (configFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. -- QTextStream configStream(&configFile); -+ QFile moduleFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri"); -+ if (moduleFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. -+ QTextStream moduleStream(&moduleFile); - -- configStream << "#paths" << endl; -- configStream << "QT_BUILD_TREE = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl; -- configStream << "QT_SOURCE_TREE = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl; -+ moduleStream << "#paths" << endl; -+ moduleStream << "QT_BUILD_TREE = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl; -+ moduleStream << "QT_SOURCE_TREE = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl; - QStringList buildParts; - buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations"; - foreach (const QString &item, disabledBuildParts) { - buildParts.removeAll(item); - } -- configStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; -+ moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; - - //so that we can build without an install first (which would be impossible) -- configStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl; -- configStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl; -- configStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl; -- configStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl; -- configStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl; -- configStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; -- configStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; -+ moduleStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl; -+ moduleStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl; -+ moduleStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl; -+ moduleStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl; -+ moduleStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl; -+ moduleStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; -+ moduleStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; - - - QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ]; - QString mkspec_path = fixSeparators(sourcePath + "/mkspecs/" + targetSpec); - if (QFile::exists(mkspec_path)) -- configStream << "QMAKESPEC = " << escapeSeparators(mkspec_path) << endl; -+ moduleStream << "QMAKESPEC = " << escapeSeparators(mkspec_path) << endl; - else -- configStream << "QMAKESPEC = " << fixSeparators(targetSpec, true) << endl; -- configStream << "ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; -+ moduleStream << "QMAKESPEC = " << fixSeparators(targetSpec, true) << endl; -+ moduleStream << "ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; - - if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") -- configStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; -+ moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; - - if (dictionary["CETEST"] == "yes") { -- configStream << "QT_CE_RAPI_INC = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl; -- configStream << "QT_CE_RAPI_LIB = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl; -+ moduleStream << "QT_CE_RAPI_INC = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl; -+ moduleStream << "QT_CE_RAPI_LIB = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl; - } - -- configStream << "#Qt for Windows CE c-runtime deployment" << endl -+ moduleStream << "#Qt for Windows CE c-runtime deployment" << endl - << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ], true) << endl; - - if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) -- configStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; -+ moduleStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; - - if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) -- configStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl; -+ moduleStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl; - - if (!dictionary["QT_LIBINFIX"].isEmpty()) -- configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; -+ moduleStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; - -- configStream << "#Qt for Symbian FPU settings" << endl; -+ moduleStream << "#Qt for Symbian FPU settings" << endl; - if (!dictionary["ARM_FPU_TYPE"].isEmpty()) { -- configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; -+ moduleStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; - } - if (!dictionary["QT_NAMESPACE"].isEmpty()) { -- configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; -+ moduleStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; - } - - // embedded - if (!dictionary["KBD_DRIVERS"].isEmpty()) -- configStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; -+ moduleStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; - if (!dictionary["GFX_DRIVERS"].isEmpty()) -- configStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; -+ moduleStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; - if (!dictionary["MOUSE_DRIVERS"].isEmpty()) -- configStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; -+ moduleStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; - if (!dictionary["DECORATIONS"].isEmpty()) -- configStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; -+ moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; - - if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) -- configStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; -+ moduleStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; - -- configStream.flush(); -- configFile.close(); -+ moduleStream.flush(); -+ moduleFile.close(); - } - - // Generate qconfig.pri -@@ -3029,6 +3025,7 @@ void Configure::generateCachefile() - else - configStream << "QT_EDITION = " << dictionary["EDITION"] << endl; - configStream << "QT_CONFIG += " << qtConfig.join(" ") << endl; -+ configStream << "QT_ELIGIBLE_MODULES += " << qtEligibleModules.join(" ") << endl; - - configStream << "#versioning " << endl - << "QT_VERSION = " << dictionary["VERSION"] << endl -@@ -3428,7 +3425,7 @@ void Configure::displayConfig() - cout << "Configuration:" << endl; - cout << " " << qmakeConfig.join("\r\n ") << endl; - cout << "Qt Configuration:" << endl; -- cout << " " << qtConfig.join("\r\n ") << endl; -+ cout << " " << qtConfig.join("\r\n ") << qtEligibleModules.join("\r\n ") << endl; - cout << endl; - - if (dictionary.contains("XQMAKESPEC")) -diff --git a/qtkernel/tools/configure/configureapp.h b/qtkernel/tools/configure/configureapp.h -index fa14f98..ad3b89a 100644 ---- a/qtkernel/tools/configure/configureapp.h -+++ b/qtkernel/tools/configure/configureapp.h -@@ -116,6 +116,8 @@ private: - QStringList qmakeConfig; - QStringList qtConfig; - -+ QStringList qtEligibleModules; -+ - QStringList qmakeSql; - QStringList qmakeSqlPlugins; - --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0053-Removed-activeqt-references-from-qttools-which-is-in.patch b/patches/master/0053-Removed-activeqt-references-from-qttools-which-is-in.patch deleted file mode 100644 index 2026b1b..0000000 --- a/patches/master/0053-Removed-activeqt-references-from-qttools-which-is-in.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a9d503ed7391eed0d1c2368434c1c1cc9aa039bb Mon Sep 17 00:00:00 2001 -From: axis <qt-info@nokia.com> -Date: Mon, 24 Jan 2011 11:35:32 +0100 -Subject: [PATCH] Removed activeqt references from Designer, which is in its own repo. - ---- - qttools/src/designer/src/plugins/plugins.pro | 1 - - qttools/src/src.pro | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/qttools/src/designer/src/plugins/plugins.pro b/qttools/src/designer/src/plugins/plugins.pro -index bcebb82..f9ef7ed 100644 ---- a/qttools/src/designer/src/plugins/plugins.pro -+++ b/qttools/src/designer/src/plugins/plugins.pro -@@ -3,7 +3,6 @@ CONFIG += ordered - - REQUIRES = !CONFIG(static,shared|static) - contains(QT_CONFIG, qt3support): SUBDIRS += widgets --win32: SUBDIRS += activeqt - # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d - contains(QT_CONFIG, webkit): SUBDIRS += qwebview - contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets -diff --git a/qttools/src/src.pro b/qttools/src/src.pro -index 54fca4a..562283b 100644 ---- a/qttools/src/src.pro -+++ b/qttools/src/src.pro -@@ -20,7 +20,6 @@ TEMPLATE = subdirs - } - } - # unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig -- win32:!wince*:SUBDIRS += activeqt - } - } - --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0055-Fixed-a-bug-in-libdir-handling.patch b/patches/master/0055-Fixed-a-bug-in-libdir-handling.patch deleted file mode 100644 index 521e957..0000000 --- a/patches/master/0055-Fixed-a-bug-in-libdir-handling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 44fa418ce476d58bebb644b3777ebcb2a489f5c9 Mon Sep 17 00:00:00 2001 -From: axis <qt-info@nokia.com> -Date: Mon, 24 Jan 2011 10:14:42 +0100 -Subject: [PATCH] Fixed a bug in libdir handling. - -We need to use QMAKE_LIBDIR instead of QMAKE_LFLAGS and -L, because -MSVC does not understand -L. ---- - qtkernel/mkspecs/features/qt_functions.prf | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index a145b9d..312a0b2 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -131,7 +131,7 @@ defineTest(qtAddModule) { - isEmpty(LINKAGE) { - # Make sure we can link to uninstalled libraries - !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { -- QMAKE_LFLAGS *= -L$$MODULE_LIBS -+ QMAKE_LIBDIR *= $$MODULE_LIBS - unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" - } - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { -@@ -152,6 +152,7 @@ defineTest(qtAddModule) { - export(INCLUDEPATH) - export(QMAKE_FRAMEWORKPATH) - export(QMAKE_LFLAGS) -+ export(QMAKE_LIBDIR) - return(true) - } - --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0059-qtmultimedia-profiles.patch b/patches/master/0059-qtmultimedia-profiles.patch deleted file mode 100644 index 038ae32..0000000 --- a/patches/master/0059-qtmultimedia-profiles.patch +++ /dev/null @@ -1,74 +0,0 @@ -From f22fb1def08786e6712f2a036ea1d71bfec502d4 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <olivier.goffart@nokia.com> -Date: Mon, 24 Jan 2011 14:24:35 +0100 -Subject: [PATCH] qtmultimedia profiles - ---- - qtmultimedia/modules/qt_multimedia.pri | 13 +++++++++++++ - qtmultimedia/src/multimedia/multimedia.pro | 4 +++- - qtmultimedia/sync.profile | 14 ++++++++++++++ - 3 files changed, 30 insertions(+), 1 deletions(-) - create mode 100644 qtmultimedia/modules/qt_multimedia.pri - create mode 100644 qtmultimedia/sync.profile - -diff --git a/qtmultimedia/modules/qt_multimedia.pri b/qtmultimedia/modules/qt_multimedia.pri -new file mode 100644 -index 0000000..b060bf2 ---- /dev/null -+++ b/qtmultimedia/modules/qt_multimedia.pri -@@ -0,0 +1,13 @@ -+QT_MULTIMEDIA_VERSION = $$QT_VERSION -+QT_MULTIMEDIA_MAJOR_VERSION = $$QT_MAJOR_VERSION -+QT_MULTIMEDIA_MINOR_VERSION = $$QT_MINOR_VERSION -+QT_MULTIMEDIA_PATCH_VERSION = $$QT_PATCH_VERSION -+ -+QT.multimedia.name = QtMultimedia -+QT.multimedia.bins = $$QT_MODULE_BIN_BASE -+QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimedia -+QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/private -+QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia -+QT.multimedia.libs = $$QT_MODULE_LIB_BASE -+QT.multimedia.depends = core gui -+QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB -diff --git a/qtmultimedia/src/multimedia/multimedia.pro b/qtmultimedia/src/multimedia/multimedia.pro -index e827cdd..781a29a 100644 ---- a/qtmultimedia/src/multimedia/multimedia.pro -+++ b/qtmultimedia/src/multimedia/multimedia.pro -@@ -1,3 +1,5 @@ -+load(qt_module) -+ - TARGET = QtMultimedia - QPRO_PWD = $$PWD - QT = core gui -@@ -6,7 +8,7 @@ DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE - - unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui - --include(../qbase.pri) -+include($$QT_SOURCE_TREE/src/qbase.pri) - - include(audio/audio.pri) - include(video/video.pri) -diff --git a/qtmultimedia/sync.profile b/qtmultimedia/sync.profile -new file mode 100644 -index 0000000..ed04e63 ---- /dev/null -+++ b/qtmultimedia/sync.profile -@@ -0,0 +1,14 @@ -+%modules = ( # path to module name map -+ "QtMultimedia" => "$basedir/src/multimedia", -+); -+%moduleheaders = ( # restrict the module headers to those found in relative path -+); -+%classnames = ( -+); -+%mastercontent = ( -+ "gui" => "#include <QtGui/QtGui>\n", -+ "core" => "#include <QtCore/QtCore>\n", -+); -+%modulepris = ( -+ "QtMultimedia" => "$basedir/modules/qt_multimedia.pri", -+); --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/master/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch deleted file mode 100644 index a8d6460..0000000 --- a/patches/master/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 45332fdf9fb4971c26978057214af64ecb958cf4 Mon Sep 17 00:00:00 2001 -From: Prasanth Ullattil <prasanth.ullattil@nokia.com> -Date: Tue, 25 Jan 2011 14:48:39 +0100 -Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. - ---- - qtkernel/mkspecs/features/qt_functions.prf | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtkernel/mkspecs/features/qt_functions.prf b/qtkernel/mkspecs/features/qt_functions.prf -index 312a0b2..96366de 100644 ---- a/qtkernel/mkspecs/features/qt_functions.prf -+++ b/qtkernel/mkspecs/features/qt_functions.prf -@@ -106,7 +106,7 @@ defineTest(qtAddModule) { - unset(LINKAGE) - mac { - CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced -- QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT} -+ QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} - FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers - !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { - INCLUDEPATH -= $$FRAMEWORK_INCLUDE -@@ -114,7 +114,7 @@ defineTest(qtAddModule) { - } - LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} - } else:!qt_no_framework { #detection -- for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { -+ for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { - exists($${frmwrk_dir}/$${MODULE_NAME}.framework) { - QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} - FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch b/patches/master/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch deleted file mode 100644 index 69dbfdb..0000000 --- a/patches/master/0061-Include-headers.pri-from-the-last-path-in-MODULE_INC.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2f7ed0070e4bfdb9c870c349175a009d0c045f8 Mon Sep 17 00:00:00 2001 -From: Prasanth Ullattil <prasanth.ullattil@nokia.com> -Date: Wed, 26 Jan 2011 09:44:09 +0100 -Subject: [PATCH] Include headers.pri from the last path in MODULE_INCLUDES - ---- - qtkernel/src/qbase.pri | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/src/qbase.pri b/qtkernel/src/qbase.pri -index 97f65e4..e428802 100644 ---- a/qtkernel/src/qbase.pri -+++ b/qtkernel/src/qbase.pri -@@ -16,7 +16,10 @@ isEmpty(QT_MAJOR_VERSION) { - - #load up the headers info - CONFIG += qt_install_headers --HEADERS_PRI = $$MODULE_INCLUDES/headers.pri -+#headers.pri is loaded from the last include path -+LAST_MODULE_INCLUDE=$$MODULE_INCLUDES -+for(include_path, MODULE_INCLUDES):LAST_MODULE_INCLUDE=$${include_path} -+HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri - include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) - - #version overriding --- -1.7.3.2.343.g7d43d - diff --git a/patches/master/0073-Avoid-recursively-including-the-same-arch.pri-file.patch b/patches/master/0073-Avoid-recursively-including-the-same-arch.pri-file.patch deleted file mode 100644 index b24f84c..0000000 --- a/patches/master/0073-Avoid-recursively-including-the-same-arch.pri-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 58e1896d80d909fcf3a4eb991c30025e75528c24 Mon Sep 17 00:00:00 2001 -From: Prasanth Ullattil <prasanth.ullattil@nokia.com> -Date: Tue, 8 Feb 2011 11:36:13 +0100 -Subject: [PATCH] Avoid recursively including the same arch.pri file - ---- - qtkernel/src/corelib/arch/arch.pri | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/src/corelib/arch/arch.pri b/qtkernel/src/corelib/arch/arch.pri -index cd23e5e..5ed5a25 100644 ---- a/qtkernel/src/corelib/arch/arch.pri -+++ b/qtkernel/src/corelib/arch/arch.pri -@@ -35,4 +35,6 @@ integrity:HEADERS += arch/qatomic_integrity.h - - QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH - DEPENDPATH += $$QT_ARCH_CPP --include($$QT_ARCH_CPP/arch.pri, "", true) -+!isEmpty(QT_ARCH) { -+ include($$QT_ARCH_CPP/arch.pri, "", true) -+} -\ No newline at end of file --- -1.7.1 - diff --git a/patches/master/0075-Wrap-string-in-qPrintable-with-QString.patch b/patches/master/0075-Wrap-string-in-qPrintable-with-QString.patch deleted file mode 100644 index f265868..0000000 --- a/patches/master/0075-Wrap-string-in-qPrintable-with-QString.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e51fef59aceb4a097d4dc87fc16111be17b4e802 Mon Sep 17 00:00:00 2001 -From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> -Date: Thu, 10 Feb 2011 11:59:01 -0600 -Subject: [PATCH] Wrap string in qPrintable with QString - -This allows you to use qPrintable on strings which might be using -the QStringBuilder class. WebKit trunk has an instance of such -usage. ---- - qtkernel/src/corelib/global/qglobal.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/qtkernel/src/corelib/global/qglobal.h b/qtkernel/src/corelib/global/qglobal.h -index 1879537..8ea50be 100644 ---- a/qtkernel/src/corelib/global/qglobal.h -+++ b/qtkernel/src/corelib/global/qglobal.h -@@ -1680,7 +1680,7 @@ inline void qUnused(T &x) { (void)x; } - #endif - - #ifndef qPrintable --# define qPrintable(string) (string).toLocal8Bit().constData() -+# define qPrintable(string) QString(string).toLocal8Bit().constData() - #endif - - Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */ --- -1.7.1 - |